From be64bd546061f6192e67fdf89493fc7f06313ce6 Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Thu, 20 Aug 2020 14:53:06 +0100
Subject: [PATCH] Fix CI image deployment

---
 .gitlab-ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42ab20e..e5ee61e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,9 +44,8 @@ deploy:commit:
   extends: .docker
   variables:
     TAG: ${CI_REGISTRY_IMAGE}/commit:${CI_COMMIT_SHORT_SHA}
-  before_script:
-    - docker pull ${BUILD_TAG}
   script:
+    - docker pull ${BUILD_TAG}
     - docker tag ${BUILD_TAG} ${TAG}
     - docker push ${TAG}
 
@@ -63,8 +62,8 @@ deploy:tag:
   except:
     - /^[^v]/
     - /^v[^0-9]/
-  script:
+  variables:
+    TAG: ${CI_REGISTRY_IMAGE}:latest
+  after_script:
     - docker tag ${BUILD_TAG} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}
-    - docker tag ${BUILD_TAG} ${CI_REGISTRY_IMAGE}:latest
     - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}
-    - docker push ${CI_REGISTRY_IMAGE}:latest
-- 
GitLab