Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update docker scripts
[releng/global-jjb.git]
/
shell
/
docker-get-git-describe.sh
diff --git
a/shell/docker-get-git-describe.sh
b/shell/docker-get-git-describe.sh
index
326f41a
..
c1a3d21
100644
(file)
--- a/
shell/docker-get-git-describe.sh
+++ b/
shell/docker-get-git-describe.sh
@@
-21,10
+21,8
@@
if [ -z "$image_build_tag" ]
then
echo "git describe returned an empty value, make sure a version tag is applied"
exit 1
then
echo "git describe returned an empty value, make sure a version tag is applied"
exit 1
-else
- image_name="$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$image_build_tag"
fi
fi
-
-# Write DOCKER_IMAGE information to a file so it can be injected into the
+echo "---> Tag found: $image_build_tag"
+# Write DOCKER_IMAGE
_TAG
information to a file so it can be injected into the
# environment for following steps
# environment for following steps
-echo "DOCKER_IMAGE
=$image_name
" >> "$WORKSPACE/env_docker_inject.txt"
+echo "DOCKER_IMAGE
_TAG=$image_build_tag
" >> "$WORKSPACE/env_docker_inject.txt"