From 176f6d86dc6c6a4ed97bbafb8573123beffa6f6f Mon Sep 17 00:00:00 2001
From: jy-wirepas <59594181+jy-wirepas@users.noreply.github.com>
Date: Thu, 11 Dec 2025 22:31:00 +0200
Subject: [PATCH] Fix GitHub Actions for publishing on Docker Hub

---
 .github/workflows/docker-publish.yml        | 25 +++++++++++----------
 .github/workflows/manual-docker-publish.yml | 18 +++++++--------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0a35b0f..0d58a5f 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,34 +19,35 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v6
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and publish master as 'edge'
         if: github.ref_name == 'master'
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
-          repository: wirepas/${{ github.event.repository.name }}
-          tags: edge
           push: true
+          tags: |
+            ${{ github.repository }}:edge
+          platforms: linux/amd64,linux/arm64
 
       - name: Build and publish tagged version as 'version' and 'latest'
         if: github.ref_type == 'tag'
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
-          repository: wirepas/${{ github.event.repository.name }}
-          tags: latest,${{ github.ref_name }}
           push: true
+          tags: |
+            ${{ github.repository }}:latest
+            ${{ github.repository }}:${{ github.ref_name }}
+          platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/manual-docker-publish.yml b/.github/workflows/manual-docker-publish.yml
index d333280..545a34e 100644
--- a/.github/workflows/manual-docker-publish.yml
+++ b/.github/workflows/manual-docker-publish.yml
@@ -19,23 +19,23 @@ jobs:
         with:
           ref: ${{ inputs.tag }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and publish the selected tag
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
-          repository: wirepas/${{ github.event.repository.name }}
-          tags: ${{ inputs.tag }}
           push: true
+          tags: |
+            ${{ github.repository }}:${{ inputs.tag }}
+          platforms: linux/amd64,linux/arm64