add additional tag to docker image if available

Author: Secure Docker Images

docker/build.sh

@@ -95,22 +95,44 @@ if [ -n "$DOCKER_REPO" ]; then
     echo "No existing image found for ${APP_IMAGE}:latest"
 fi
 
+# Get tag if available
+FULL_TAG=$(git tag --contains $COMMIT_HASH | grep $APP_NAME | tail -n1)
+echo "Full tag: $FULL_TAG"
+SHORT_TAG=$(echo $FULL_TAG | sed s/".*\@"//)
+
 # Build the app image.
 echo "====="
 echo "= Build the app image and push to registry"
 echo "====="
-docker build \
-  --cache-from "${APP_IMAGE}":latest \
-  --cache-from "${BUILD_IMAGE}":latest \
-  --tag "${APP_IMAGE}":latest \
-  --tag "${APP_IMAGE}":"${COMMIT_HASH}" \
-  --build-arg TEMP_DEPS_DIR=${TEMP_DEPS_DIR} \
-  --build-arg APP_NAME="${APP_FULL_NAME}" \
-  --build-arg APP_DIR="${APP_DIR}" \
-  --build-arg COMMIT_HASH="${COMMIT_HASH}" \
-  --build-arg SHORT_APP_DIR="${SHORT_APP_DIR}" \
-  --file ./docker/Dockerfile \
-  .
+
+if [ -n "$FULL_TAG" ]; then
+  docker build \
+    --cache-from "${APP_IMAGE}":latest \
+    --cache-from "${BUILD_IMAGE}":latest \
+    --tag "${APP_IMAGE}":latest \
+    --tag "${APP_IMAGE}":"${COMMIT_HASH}" \
+    --tag "${APP_IMAGE}":"${SHORT_TAG}" \
+    --build-arg TEMP_DEPS_DIR=${TEMP_DEPS_DIR} \
+    --build-arg APP_NAME="${APP_FULL_NAME}" \
+    --build-arg APP_DIR="${APP_DIR}" \
+    --build-arg COMMIT_HASH="${COMMIT_HASH}" \
+    --build-arg SHORT_APP_DIR="${SHORT_APP_DIR}" \
+    --file ./docker/Dockerfile \
+    .
+else
+  docker build \
+    --cache-from "${APP_IMAGE}":latest \
+    --cache-from "${BUILD_IMAGE}":latest \
+    --tag "${APP_IMAGE}":latest \
+    --tag "${APP_IMAGE}":"${COMMIT_HASH}" \
+    --build-arg TEMP_DEPS_DIR=${TEMP_DEPS_DIR} \
+    --build-arg APP_NAME="${APP_FULL_NAME}" \
+    --build-arg APP_DIR="${APP_DIR}" \
+    --build-arg COMMIT_HASH="${COMMIT_HASH}" \
+    --build-arg SHORT_APP_DIR="${SHORT_APP_DIR}" \
+    --file ./docker/Dockerfile \
+    .
+fi
 
 echo "====="
 echo "= Check images list"
@@ -122,6 +144,13 @@ echo "====="
 echo "= Push the app image"
 echo "====="
 if [ -n "$DOCKER_REPO" ]; then
-  docker push "${APP_IMAGE}":latest
-  docker push "${APP_IMAGE}":"${COMMIT_HASH}"
+  if [ -n "$FULL_TAG" ]; then
+    docker push "${APP_IMAGE}":latest
+    docker push "${APP_IMAGE}":"${COMMIT_HASH}"
+    docker push "${APP_IMAGE}":"${SHORT_TAG}"
+  else
+    docker push "${APP_IMAGE}":latest
+    docker push "${APP_IMAGE}":"${COMMIT_HASH}"
+  fi
+
 fi