added push images on merge

.gitlab-ci.yml

@@ -56,21 +56,28 @@ build dev capability:
             - shared/**/*.{py,sh}
 
 # Push
-# push dev workflow:
-#     stage: push-dev
-#     script:
-#         - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
-#         - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
-#         - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-#     needs: ["build dev workflow"]
+push dev workflow:
+    stage: push-dev
+    script:
+        - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
+        - docker tag marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/workflow:dev
+        - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_COMMIT_SHORT_SHA
+        - docker push marconi.aoc.nrao.edu/workspaces/workflow:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+        - docker push marconi.aoc.nrao.edu/workspaces/workflow:dev
+    rules:
+        - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/
+    # needs: ["build dev workflow"]
 
-# push dev capability:
-#     stage: push-dev
-#     script:
-#         - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
-#         - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
-#         - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-#     needs: ["build dev capability"]
+push dev capability:
+    stage: push-dev
+    script:
+        - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $HARBOR_URL
+        - docker tag marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME marconi.aoc.nrao.edu/workspaces/capability:dev
+        - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_COMMIT_SHORT_SHA
+        - docker push marconi.aoc.nrao.edu/workspaces/capability:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    rules:
+        - if: $CI_COMMIT_MESSAGE =~ /\A(?i)Merge/
+    # needs: ["build dev capability"]
 
 # Cleanup
 # clean runner: