From 517a8fa8614623f884342e60643ddf8ce2593b38 Mon Sep 17 00:00:00 2001
From: Jimmy Galland <jimmygalland@noreply@celjim.fr>
Date: Thu, 15 Jan 2026 22:52:52 +0000
Subject: [PATCH] Update .github/workflows/docker.yml

---
 .github/workflows/docker.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9c853f6..5b657af 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -61,21 +61,20 @@ jobs:
 
       - name: Build & push with registry cache
         run: |
+          TAGS="\
+            -t jimmygalland/nextcloud:$NC_VERS \
+            -t git.celjim.fr/jimmygalland/nextcloud:$NC_VERS"
+
+          if [ "${{ inputs.latest }}" = "true" ]; then
+            TAGS="$TAGS \
+              -t jimmygalland/nextcloud:latest \
+              -t git.celjim.fr/jimmygalland/nextcloud:latest"
+          fi
+
           docker buildx build \
             --push \
             --build-arg NC_VERS=$NC_VERS \
             --cache-from type=registry,ref=git.celjim.fr/jimmygalland/nextcloud:buildcache \
             --cache-to type=registry,ref=git.celjim.fr/jimmygalland/nextcloud:buildcache,mode=max \
-            -t jimmygalland/nextcloud:$NC_VERS \
-            -t git.celjim.fr/jimmygalland/nextcloud:$NC_VERS \
+            $TAGS \
             ./$MAJOR_VERS
-
-      - name: Tag & push latest
-        if: ${{ inputs.latest == 'true' }}
-        run: |
-          docker tag jimmygalland/nextcloud:$NC_VERS jimmygalland/nextcloud:latest
-          docker tag jimmygalland/nextcloud:$NC_VERS git.celjim.fr/jimmygalland/nextcloud:latest
-
-          docker push jimmygalland/nextcloud:latest
-          docker push git.celjim.fr/jimmygalland/nextcloud:latest
-