From 3a77b4a429e56d7ae2f6230f045682930dc54752 Mon Sep 17 00:00:00 2001
From: Ariel Rin <ozirascal@gmail.com>
Date: Sat, 7 Oct 2023 19:57:55 +1000
Subject: [PATCH] Add missing docker tags, make docker buildsteps more readable

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f695b6b0..95398f63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -259,7 +259,16 @@ build-image:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build . -t $IMAGE_TAG -t $MINOR_TAG -t $MAJOR_TAG -t $LATEST_TAG -f docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
+    docker buildx build .
+      --tag $IMAGE_TAG
+      --tag $CURRENT_TAG
+      --tag $MINOR_TAG
+      --tag $MAJOR_TAG
+      --tag $LATEST_TAG
+      --file docker/Dockerfile
+      --platform linux/amd64,linux/arm64
+      --push
+      --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
   rules:
     - if: $CI_COMMIT_TAG
       when: delayed
@@ -279,7 +288,12 @@ build-image-dev:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build . -t $IMAGE_TAG -f docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
+    docker buildx build .
+      --tag $IMAGE_TAG
+      --file docker/Dockerfile
+      --platform linux/amd64,linux/arm64
+      --push
+      --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
   rules:
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
       when: manual
@@ -300,7 +314,12 @@ build-image-mr:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build . -t $IMAGE_TAG -f docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    docker buildx build .
+    --tag $IMAGE_TAG
+    --file docker/Dockerfile
+    --platform linux/amd64,linux/arm64
+    --push
+    --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: manual