commit 536cb9e724b1e7fc458096ae3ebca798a6fddcc2
author Thomas Draebing <thomas.draebing@sap.com> Tue Apr 05 11:21:10 2022 +0200
committer Thomas Draebing <thomas.draebing@sap.com> Tue Jul 05 14:24:04 2022 +0200
tree 391558253b4bd150a6192e5fd8e9e434873f916d
parent 35553448fd55d244466940ec00afd715e909ea46

Use --tag to overwrite default tag in ./build

Using the --tag option for ./build did not overwrite the default tag
consisting of the git describe output, but added it in addition.
If not set, it defaulted to latest. This led to issues or more
overhead, if preparing for concurrent builds, since a unique tag
always had to be set in addition to the unique tag already being the
default.

Now only the tag built from git describe is being used by default.
If --tag is used only the given tag is used.

Change-Id: I79030d43a86edae987cb422e19fbd931b9f1543c

build

diff --git a/build b/build
index f56172c..ec862f6 100755
--- a/build
+++ b/build
@@ -37,22 +37,16 @@
     BUILD_ARGS="--build-arg GERRIT_WAR_URL=$GERRIT_WAR_URL"
 fi
 
-test -z "$TAG" && TAG=latest
-
-export GIT_REV_TAG="$(git describe --always --dirty)-unknown"
-
 docker_build(){
     IMAGE=$1
 
-    docker build -t k8sgerrit/$IMAGE:$TAG \
-        -t k8sgerrit/$IMAGE:$GIT_REV_TAG \
-        ./container-images/$IMAGE
+    docker build -t k8sgerrit/$IMAGE:$TAG ./container-images/$IMAGE
 
     if test $? -ne 0; then
         REPORT="$REPORT Failed: k8sgerrit/$IMAGE.\n"
         RETURN_CODE=1
     else
-        REPORT="$REPORT Success: k8sgerrit/$IMAGE:$TAG\n Success: k8sgerrit/$IMAGE:$GIT_REV_TAG\n"
+        REPORT="$REPORT Success: k8sgerrit/$IMAGE:$TAG\n"
     fi
 }
 
@@ -62,13 +56,17 @@
         echo -e "\n\nFailed to build gerrit-base image."
         exit 1
     fi
+
+    if test -z "$TAG"; then
+        export TAG="$(create_image_tag)"
+    fi
 }
 
 create_image_tag(){
     GERRIT_VERSION=$(docker run --entrypoint "/bin/sh" gerrit-base \
         -c "java -jar /var/gerrit/bin/gerrit.war version")
     GERRIT_VERSION=$(echo "${GERRIT_VERSION##*$'\n'}" | cut -d' ' -f3 | tr -d '[:space:]')
-    GIT_REV_TAG="$(git describe --dirty)-$GERRIT_VERSION"
+    echo "$(git describe --dirty)-$GERRIT_VERSION"
 }
 
 REPORT="Build results: \n"
@@ -82,7 +80,6 @@
 
 if test $# -eq 0 ; then
     docker_build_gerrit_base
-    create_image_tag
     for IMAGE in $IMAGES; do
         docker_build $IMAGE
     done
@@ -90,11 +87,13 @@
     while test $# -gt 0 ; do
         if [[ $1 = gerrit-* ]]; then
             docker_build_gerrit_base
-            create_image_tag
         else
+            if test -z "$TAG"; then
+                TAG="$(git describe --always --dirty)-unknown"
+            fi
             echo -e "\nNo Image containing Gerrit will be built." \
                     "The Gerrit-version can thus not be determinded." \
-                    "Using tag $GIT_REV_TAG\n"
+                    "Using tag $TAG\n"
         fi
         docker_build $1
         shift