#690: don't push docker image tag aliases for versions containing a "-" (e.g. 1.2.0-M2)

Signed-off-by: Thomas Jaeckle <[email protected]>

Author: thjaeckle

Diff for: .github/workflows/push-dockerhub.yml

@@ -20,12 +20,14 @@ jobs:
         echo "::set-env name=IMAGE_TAG::${GITHUB_REF#refs/tags/}"
         echo "::set-env name=IMAGE_MINOR_TAG::$(echo ${GITHUB_REF#refs/tags/} | cut -d. -f-2)"
         echo "::set-env name=IMAGE_MAJOR_TAG::$(echo ${GITHUB_REF#refs/tags/} | cut -d. -f-1)"
+        echo "::set-env name=MILESTONE_OR_RC_SUFFIX::$(echo ${GITHUB_REF#refs/tags/} | cut -d- -f2)"
     - name: Building Docker images for tag
       run: |
         echo $IMAGE_TAG
         echo "Full version: $IMAGE_TAG"
         echo "Minor version: $IMAGE_MINOR_TAG"
         echo "Major version: $IMAGE_MAJOR_TAG"
+        echo "Milestone or RC suffix: $MILESTONE_OR_RC_SUFFIX"
     - name: Build the Docker images
       run: |
         docker build -f services/dockerfile-release --build-arg SERVICE_STARTER=ditto-services-policies-starter     --build-arg SERVICE_VERSION=$IMAGE_TAG   -t eclipse/ditto-policies:$IMAGE_TAG      -t eclipse/ditto-policies:$IMAGE_MINOR_TAG      -t eclipse/ditto-policies:$IMAGE_MAJOR_TAG      -t eclipse/ditto-policies:latest .;
@@ -39,26 +41,29 @@ jobs:
     - name: Push the Docker images to Docker Hub
       run: |
         docker push eclipse/ditto-policies:$IMAGE_TAG;
+        docker push eclipse/ditto-things:$IMAGE_TAG;
+        docker push eclipse/ditto-things-search:$IMAGE_TAG;
+        docker push eclipse/ditto-concierge:$IMAGE_TAG;
+        docker push eclipse/ditto-gateway:$IMAGE_TAG;
+        docker push eclipse/ditto-connectivity:$IMAGE_TAG;
+    - name: Push the Docker images of tag aliases to Docker Hub
+      if: env.MILESTONE_OR_RC_SUFFIX == env.IMAGE_TAG
+      run: |
         docker push eclipse/ditto-policies:$IMAGE_MINOR_TAG;
         docker push eclipse/ditto-policies:$IMAGE_MAJOR_TAG;
         docker push eclipse/ditto-policies:latest;
-        docker push eclipse/ditto-things:$IMAGE_TAG;
         docker push eclipse/ditto-things:$IMAGE_MINOR_TAG;
         docker push eclipse/ditto-things:$IMAGE_MAJOR_TAG;
         docker push eclipse/ditto-things:latest;
-        docker push eclipse/ditto-things-search:$IMAGE_TAG;
         docker push eclipse/ditto-things-search:$IMAGE_MINOR_TAG;
         docker push eclipse/ditto-things-search:$IMAGE_MAJOR_TAG;
         docker push eclipse/ditto-things-search:latest;
-        docker push eclipse/ditto-concierge:$IMAGE_TAG;
         docker push eclipse/ditto-concierge:$IMAGE_MINOR_TAG;
         docker push eclipse/ditto-concierge:$IMAGE_MAJOR_TAG;
         docker push eclipse/ditto-concierge:latest;
-        docker push eclipse/ditto-gateway:$IMAGE_TAG;
         docker push eclipse/ditto-gateway:$IMAGE_MINOR_TAG;
         docker push eclipse/ditto-gateway:$IMAGE_MAJOR_TAG;
         docker push eclipse/ditto-gateway:latest;
-        docker push eclipse/ditto-connectivity:$IMAGE_TAG;
         docker push eclipse/ditto-connectivity:$IMAGE_MINOR_TAG;
         docker push eclipse/ditto-connectivity:$IMAGE_MAJOR_TAG;
         docker push eclipse/ditto-connectivity:latest;