From d9afee0fad25755a57337b563ac1f1ba3eb603b4 Mon Sep 17 00:00:00 2001
From: Matej Sima <matej.sima@gmail.com>
Date: Wed, 25 Sep 2019 13:19:44 +0200
Subject: [PATCH] Attempt to fix docker_build CI config

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5801ca4f..1fa3cd9ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,8 +50,6 @@ stages:
   services:
     - docker:dind
 
-.docker_build: &docker_build
-  - docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
 
 .before_script: &before_script
   before_script:
@@ -96,7 +94,7 @@ build-current-docker-image:
   stage: build_docker
   <<: *docker
   script:
-    <<: *docker_build
+    - docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
     - sh scripts/test_cli.sh
   except:
     - master
@@ -108,9 +106,9 @@ build-and-publish-latest-docker-image:
   stage: build_and_deploy_docker
   <<: *docker
   script:
-    <<: *docker_build
-    - docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD
+    - docker build -t $LIGO_REGISTRY_IMAGE:next -f ./docker/Dockerfile .
     - sh scripts/test_cli.sh
+    - docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD
     - docker push $LIGO_REGISTRY_IMAGE:next
   only:
     - dev