From c5285747360a7273755a2e2a9b62f2f378b5e0cb Mon Sep 17 00:00:00 2001
From: 10 <2408212-10@users.noreply.gitlab.com>
Date: Sun, 24 Jan 2021 23:06:41 +0100
Subject: [PATCH] fixed image tagging

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f03aff..bd8219d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ stages:
   - build:docker
 
 variables:
-  IMAGE_NAME: "$CI_REGISTRY_IMAGE"
   IMAGE_NAME_DOCKERHUB: "index.docker.io/bruceforce/bw_backup"
   # see https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
   DOCKER_DRIVER: overlay2
@@ -41,7 +40,7 @@ build_master:
     - *docker_login
     - *dockerhub_login
     #- docker build --pull -t "$IMAGE_NAME" -t "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" .
-    - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$IMAGE_NAME" -t "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" .
+    - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-latest}" -t "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" .
     #- docker push "$IMAGE_NAME"
     #- docker push "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}"
   only:
@@ -58,7 +57,7 @@ build:
   script:
     - *docker_login
     #- docker build --pull -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}" .
-    - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}" .
+    - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" .
     #- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}"
   except:
     - master