Skip to content

Commit ecb3cfd

Browse files
authored
Merge pull request #4593 from vvbandeira/dev-tag-drop-or-version
fix(docker): drop OpenROAD version from the dev tag
2 parents 163e3ac + 181fe26 commit ecb3cfd

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

‎etc/DockerHelper.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ usage: $0 [CMD] [OPTIONS]
2828
copy source code and build app
2929
-threads=N Max number of threads to use if compiling.
3030
Default = \$(nproc)
31-
-tag=TAG Use as the image tag. Default includes the
32-
OpenROAD version and image content hash.
31+
-tag=TAG Use as the image tag. Default is a hash of
32+
the files that define the image.
3333
-username=USERNAME Username to loging at the docker registry.
3434
-password=PASSWORD Password to loging at the docker registry.
3535
-ci Install CI tools in image

‎etc/DockerTag.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ if [[ "$@" == "-dev" ]]; then
1212
"./etc/requirements-pip_lock.txt"
1313
"./tools/OpenROAD/etc/DependencyInstaller.sh"
1414
)
15-
or_version=$(git -C tools/OpenROAD describe --tags --always)
16-
image_hash=$(cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}')
17-
echo "${or_version}-${image_hash}"
15+
cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}'
1816
elif [[ "$@" == "-master" ]]; then
1917
git fetch --tags >&2
2018
git -C tools/OpenROAD fetch --tags >&2

0 commit comments

Comments
 (0)