From d11a8111efd010a06f4686d9ee414af2922106a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=20Gl=C3=A4=C3=9F-St=C3=B6cker?= <micha@stoecker.me>
Date: Sun, 20 Jun 2021 10:01:15 +0200
Subject: [PATCH] don't use hardcoded docker hub image name/path, use the
 DOCKER_LOGIN ci variable

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 527d368..f8a3a9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,12 +12,12 @@ build:
   stage: build
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-    D_IMAGE_TAG: egon0/flarum-multiarch:$CI_COMMIT_REF_SLUG
-    D_LATEST_TAG: egon0/flarum-multiarch:latest
+    D_IMAGE_TAG: $DOCKER_LOGINflarum-multiarch:$CI_COMMIT_REF_SLUG
+    D_LATEST_TAG: $DOCKER_LOGIN/flarum-multiarch:latest
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
     - git clone https://github.com/mondediefr/docker-flarum.git
     - cd docker-flarum
     - docker buildx create --use --name A$CI_COMMIT_SHORT_SHA
-    - docker buildx build --platform $BUILD_PLATFORMS --push -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) -t $D_IMAGE_TAG -t $D_LATEST_TAG -t egon0/flarum-multiarch:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) .
+    - docker buildx build --platform $BUILD_PLATFORMS --push -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) -t $D_IMAGE_TAG -t $D_LATEST_TAG -t $DOCKER_LOGIN/flarum-multiarch:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) .