From 46fbf67a9995c3e1e8eb25d03ecc674f6d26c39b Mon Sep 17 00:00:00 2001
From: Jonas Zohren <git-pbkyr@jzohren.de>
Date: Sun, 21 Nov 2021 20:35:59 +0100
Subject: [PATCH] Fix(CI): use local image tag to push to DockerHub

To push to DockerHub after building, a matching tag needs to be present.
---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02594ac..9b031fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,6 +168,7 @@ build:debug:cargo:x86_64-unknown-linux-musl:
       --platform "$PLATFORMS"
       --tag "$GL_IMAGE_TAG"
       --tag "$GL_IMAGE_TAG-commit-$CI_COMMIT_SHORT_SHA"
+      --tag "$LOCAL_DH_IMAGE_TAG"
       --file "$DOCKER_FILE" .
     # Only try to push to docker hub, if auth data for dockerhub exists:
     - if [ -n "${DOCKER_HUB}" ]; then docker push "$DH_IMAGE_TAG"; fi
@@ -180,6 +181,7 @@ build:docker:next:
   variables:
     GL_IMAGE_TAG: "$CI_REGISTRY_IMAGE/matrix-conduit:next"
     DH_IMAGE_TAG: "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:next"
+    LOCAL_DH_IMAGE_TAG: "matrixconduit/matrix-conduit:next" # Local image tag then pushed to dockerhub
 
 build:docker:master:
   extends: .docker-shared-settings
@@ -188,6 +190,7 @@ build:docker:master:
   variables:
     GL_IMAGE_TAG: "$CI_REGISTRY_IMAGE/matrix-conduit:latest"
     DH_IMAGE_TAG: "$DOCKER_HUB_IMAGE/matrixconduit/matrix-conduit:latest"
+    LOCAL_DH_IMAGE_TAG: "matrixconduit/matrix-conduit:latest" # Local image tag then pushed to dockerhub
 
 ## Build a docker image by packaging up the x86_64-unknown-linux-musl binary into an alpine image
 #.docker-shared-settings: