Be more strict on docker tag checking.

jlesage · Aug 24, 2017 · 228e8fa · 228e8fa
1 parent a70516f
commit 228e8fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/hooks/post_push b/hooks/post_push
@@ -18,14 +18,17 @@ echo "Environment variables:
     IMAGE_VERSION=$IMAGE_VERSION
 "
 
-if [[ "$DOCKER_TAG" =~ -alpha[0-9]*$ ]]; then
-    DOCKER_NEWTAG="alpha"
-elif [[ "$DOCKER_TAG" =~ -beta[0-9]*$ ]]; then
-    DOCKER_NEWTAG="beta"
-elif [[ "$DOCKER_TAG" =~ -rc[0-9]*$ ]]; then
-    DOCKER_NEWTAG="rc"
-else
+if [[ "$DOCKER_TAG" =~ v[0-9]+\.[0-9]+\.[0-9]+-alpha[0-9]+$ ]]; then
+    DOCKER_NEWTAG="$(echo "$DOCKER_TAG" | sed 's/-alpha[0-9]\+$/-alpha/')"
+elif [[ "$DOCKER_TAG" =~ v[0-9]+\.[0-9]+\.[0-9]+-beta[0-9]+$ ]]; then
+    DOCKER_NEWTAG="$(echo "$DOCKER_TAG" | sed 's/-beta[0-9]\+$/-beta/')"
+elif [[ "$DOCKER_TAG" =~ v[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$ ]]; then
+    DOCKER_NEWTAG="$(echo "$DOCKER_TAG" | sed 's/-rc[0-9]\+$/-rc/')"
+elif [[ "$DOCKER_TAG" =~ v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
     DOCKER_NEWTAG="latest"
+else
+    echo "ERROR: Invalid docker tag."
+    exit 1
 fi
 
 echo "Adding tag '$DOCKER_NEWTAG' to image..."

diff --git a/hooks/pre_build b/hooks/pre_build
@@ -11,10 +11,9 @@ set -u # Treat unset variables as an error.
 
 # Make sure the DOCKER_TAG has a supported format like:
 #     v1.0.0
-#     v0.1.0-beta
-#     v2.0.0-rc
+#     v0.1.0-beta1
 #     v2.0.0-rc2
-if [[ ! "$DOCKER_TAG" =~ ^v[0-9\.]+(-(alpha|beta|rc)[0-9]*)?$ ]]; then
+if [[ ! "$DOCKER_TAG" =~ ^v[0-9\.]+(-(alpha|beta|rc)[0-9]+)?$ ]]; then
   echo "Unsupported DOCKER_TAG: $DOCKER_TAG"
   exit 1
 fi