From fb4ae46e29735ea2f831b60e0713175889dbce77 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Thu, 24 Aug 2017 15:10:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=20=D1=8D=D1=82=D0=B0=D0=BF=20?=
 =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20docker=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=B0=20=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2500502..ad80dc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,6 @@ variables:
 
 .docker_template: &setup_docker_environment
   image: docker:latest
-  variables:
-    GIT_STRATEGY: none
   before_script:
     - docker login -u gitlab-ci -p $CI_BUILD_TOKEN registry.ely.by
     - export TEMP_IMAGE_NAME="$CONTAINER_IMAGE:$CI_PIPELINE_ID"
@@ -59,6 +57,8 @@ build docker image:
 push dev:
   <<: *setup_docker_environment
   stage: push
+  variables:
+    GIT_STRATEGY: none
   script:
     - export IMAGE_NAME="$CONTAINER_IMAGE:dev"
     - docker tag $TEMP_IMAGE_NAME $IMAGE_NAME
@@ -69,6 +69,8 @@ push dev:
 push tag:
   <<: *setup_docker_environment
   stage: push
+  variables:
+    GIT_STRATEGY: none
   script:
     - export IMAGE_NAME="$CONTAINER_IMAGE:$CI_BUILD_TAG"
     - export LATEST_IMAGE_NAME="$CONTAINER_IMAGE:latest"