From c438a8b75ba34b4ed33f004a777734c5042d1e8a Mon Sep 17 00:00:00 2001
From: ssube <seansube@gmail.com>
Date: Sun, 30 Jun 2019 20:36:04 -0500
Subject: [PATCH] build: split jobs to fix image tagging

---
 .gitlab-ci.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12c0c6d..e5ab203 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,14 +49,15 @@ stages:
     - mkdir ${HOME}/.docker
     - echo "${DOCKER_SECRET}" | base64 -d > ${HOME}/.docker/config.json
     - docker info
-
+  script:
+    - docker build -t $IMAGE_TAG .
+    - docker push $IMAGE_TAG
   after_script:
     - rm -rfv ${HOME}/.docker
 
   variables: &vars-docker
     DOCKER_DRIVER: overlay2
     DOCKER_HOST: tcp://localhost:2375
-    IMAGE_TAG: ssube/salty-dog:${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}
 
 .build-node: &build-node
   image: apextoaster/node:11.15
@@ -98,15 +99,29 @@ build-node:
       - node_modules
       - out/cache
 
-build-image:
+build-image-branch:
   <<: [*build-docker]
   stage: image
+  except:
+    - tags
 
   dependencies:
     - build-node
-  script:
-    - docker build -t $IMAGE_TAG .
-    - docker push $IMAGE_TAG
+  variables:
+    <<: [*vars-docker]
+    IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_REF_SLUG}"
+
+build-image-tag:
+  <<: [*build-docker]
+  stage: image
+  only:
+    - tags
+
+  dependencies:
+    - build-node
+  variables:
+    <<: [*vars-docker]
+    IMAGE_TAG: "ssube/salty-dog:${CI_COMMIT_TAG}"
 
 # publish jobs
 publish-npm: