From 8c395ebeb3118494ec72c7e64f00fec3e73f4d24 Mon Sep 17 00:00:00 2001
From: Aryom Belousov <flygrounder@tutanota.com>
Date: Tue, 10 Nov 2020 09:48:02 +0300
Subject: [PATCH] Changed naming scheme for docker images

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 140ca49..466d334 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,12 +8,13 @@ deploy:
   image: "docker:19.03.12"
   variables:
     DOCKER_TLS_CERTDIR: "/certs"
+    IMAGE_NAME: "$DOCKER_IMAGE_TAG:$CI_JOB_ID_$CI_COMMIT_SHORT_SHA"
   services:
     - docker:19.03.12-dind
   script:
-    - docker build . -t $DOCKER_IMAGE_TAG -t $DOCKER_IMAGE_TAG:$CI_JOB_ID$CI_COMMIT_SHORT_SHA
+    - docker build . -t $DOCKER_IMAGE_TAG -t $IMAGE_NAME
     - docker login $REGISTRY_NAME -u $DOCKER_USER -p $DOCKER_PASSWORD
-    - docker push $DOCKER_IMAGE_TAG:$CI_JOB_ID$CI_COMMIT_SHORT_SHA
+    - docker push $IMAGE_NAME
     - docker push $DOCKER_IMAGE_TAG
   only:
     - master