added tagged commit conditionals to CI stages

.gitlab-ci.yml

@@ -54,6 +54,10 @@ build dev workflow:
                 docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" -f services/workflow/Dockerfile.dev . ; \
                 docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
                 echo "WORKFLOW_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" >> build.env; \
+            elif [ "$CI_COMMIT_TAG" != "" ]; then \
+                echo "Building tag: ${CI_COMMIT_TAG}"; \
+                docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_TAG" -f services/workflow/Dockerfile.dev . ; \
+                docker tag marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_TAG" marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_SHORT_SHA" ; \
             else
                 echo "Building branch: ${CI_COMMIT_BRANCH}"; \
                 docker build -t marconi.aoc.nrao.edu/workspaces/workflow:"$CI_COMMIT_BRANCH" -f services/workflow/Dockerfile.dev . ; \
@@ -91,6 +95,10 @@ build dev capability:
                 docker build -t marconi.aoc.nrao.edu/workspaces/capability:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" -f services/capability/Dockerfile.dev . ; \
                 docker tag marconi.aoc.nrao.edu/workspaces/capability:"$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_SHORT_SHA" ; \
                 echo "CAPABILITY_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" >> build.env; \
+            elif [ "$CI_COMMIT_TAG" != "" ]; then \
+                echo "Building tag: ${CI_COMMIT_TAG}"; \
+                docker build -t marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_TAG" -f services/capability/Dockerfile.dev . ; \
+                docker tag marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_TAG" marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_SHORT_SHA" ; \
             else
                 echo "Building branch: ${CI_COMMIT_BRANCH}"; \
                 docker build -t marconi.aoc.nrao.edu/workspaces/capability:"$CI_COMMIT_BRANCH" -f services/capability/Dockerfile.dev . ; \
@@ -145,6 +153,9 @@ push dev workflow:
                     docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/workflow:dev-branch ; \
                     docker push marconi.aoc.nrao.edu/workspaces/workflow:dev-branch ; \
                 fi
+            elif [ "$CI_COMMIT_TAG" != "" ]; then \
+                echo "Pushing Tagged image to registry: ${CI_COMMIT_TAG}"; \
+                docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_TAG ; \
             else
                 echo "Pushing branch image to registry: ${CI_COMMIT_BRANCH}"; \
                 docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_BRANCH ; \
@@ -175,6 +186,9 @@ push dev capability:
                     docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev-branch ; \
                     docker push marconi.aoc.nrao.edu/workspaces/capability:dev-branch ; \
                 fi
+            elif [ "$CI_COMMIT_TAG" != "" ]; then \
+                echo "Pushing Tagged image to registry: ${CI_COMMIT_TAG}"; \
+                docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_TAG ; \
             else
                 echo "Pushing branch image to registry: ${CI_COMMIT_BRANCH}"; \
                 docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_BRANCH ; \
@@ -256,6 +270,7 @@ deploy test:
         |
             echo "branch: ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
             echo "tag: ${CI_COMMIT_TAG}"
+            SWARM_NODE_ENV="test" TAG_TO_DEPLOY="${CI_COMMIT_TAG}" docker stack deploy --compose-file docker-compose.dev.yml workspaces-dev
     rules:
         - if: $CI_COMMIT_TAG
           when: manual
\ No newline at end of file