Merge pull request #271 from cyberark/dockerhub-publish

Update push-image to only push on new tagged version

Author: Geri Jennings

push-image

@@ -1,28 +1,38 @@
-#!/bin/bash -eu
-
-# Push the 'cli:5' image to Dockerhub when on the 'master' branch
-
-cd "$(git rev-parse --show-toplevel)"
-
-IMAGE='cyberark/conjur-cli'
-
-function tag_and_push() {
-    local image="$1"
-    local tag="$2"
-    local description="$3"
-
-    echo "TAG = $tag, $description"
-
-    docker tag "$image" "$image:$tag"
-    docker push "$image:$tag"
-}
-
-version_tag="5-$(cat VERSION)"
-
-tag_and_push $IMAGE '5'        'latest image'
-tag_and_push $IMAGE '5-latest'   'same as "5"'
-tag_and_push $IMAGE $version_tag 'version-specific image'
-
-# push to legacy `conjurinc/cli5` tag
-docker tag "$IMAGE" conjurinc/cli5:latest
-docker push conjurinc/cli5:latest
+#!/bin/bash
+
+set -e
+
+readonly REGISTRY="cyberark"
+readonly VERSION="$(cat VERSION)"
+readonly VERSION_TAG="5-${VERSION}"
+readonly image_name="conjur-cli"
+readonly full_image_name="${REGISTRY}/${image_name}:latest"
+
+readonly TAGS=(
+  "5"
+  "5-latest"
+  "$VERSION_TAG"
+)
+
+# fetching tags is required for git_description to work
+git fetch --tags
+git_description=$(git describe)
+
+# if it’s not a tagged commit, VERSION will have extra junk (i.e. -g666c4b2), so we won’t publish that commit
+# only when tag matches the VERSION, push VERSION and latest releases
+# and x and x.y releases
+#Ex: v5-6.2.1
+if [ "$git_description" = "v${VERSION_TAG}" ]; then
+  echo "Revision $git_description matches version $VERSION exactly. Pushing to Dockerhub..."
+
+  for tag in "${TAGS[@]}"; do
+    echo "Tagging and pushing $REGISTRY/$image_name:$tag"
+
+    docker tag $full_image_name "$REGISTRY/$image_name:$tag"
+    docker push "$REGISTRY/$image_name:$tag"
+  done
+
+  # push to legacy `conjurinc/cli5` tag
+  docker tag $full_image_name conjurinc/cli5:latest
+  docker push conjurinc/cli5:latest
+fi