Move Docker build to separate buildx workflow, remove Dockerfile.goreleaser

Author: hilli

.github/workflows/release.yaml

@@ -45,14 +45,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
 
-      # Prepare a clean binary layout for the multi-arch Docker build.
-      # Goreleaser outputs to dist/kefw2ui_linux_amd64_v1/ and
-      # dist/kefw2ui_linux_arm64_v8.0/; we normalize to dist/linux_{arch}/.
-      - name: Prepare Docker binaries
-        run: |
-          mkdir -p dist/linux_amd64 dist/linux_arm64
-          cp dist/kefw2ui_linux_amd64_v*/kefw2ui dist/linux_amd64/kefw2ui
-          cp dist/kefw2ui_linux_arm64_v*/kefw2ui dist/linux_arm64/kefw2ui
+  docker:
+    name: Docker
+    runs-on: ubuntu-24.04
+    needs: release
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -67,25 +66,25 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Docker meta
-      #   id: meta
-      #   uses: docker/metadata-action@v5
-      #   with:
-      #     images: ghcr.io/hilli/kefw2ui
-      #     tags: |
-      #       type=semver,pattern={{version}}
-      #       type=semver,pattern={{major}}.{{minor}}
-      #       type=raw,value=latest,enable={{is_default_branch}}
-      #     labels: |
-      #       org.opencontainers.image.title=kefw2ui
-      #       org.opencontainers.image.description=Web UI for controlling KEF W2 speakers
-      #       org.opencontainers.image.source=https://github.com/hilli/kefw2ui
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/hilli/kefw2ui
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable={{is_default_branch}}
+          labels: |
+            org.opencontainers.image.title=kefw2ui
+            org.opencontainers.image.description=Web UI for controlling KEF W2 speakers
+            org.opencontainers.image.source=https://github.com/hilli/kefw2ui
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: Dockerfile.goreleaser
+          file: Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.goreleaser.yaml

@@ -24,7 +24,7 @@ builds:
       - amd64
       - arm64
     goarm:
-      - 7
+      - "7"
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath
@@ -101,26 +101,5 @@ nfpms:
         - statically-linked-binary
         - changelog-file-missing-in-native-package
 
-dockers_v2:
-  - images:
-      - "ghcr.io/hilli/kefw2ui"
-    id: kefw2ui
-    dockerfile: Dockerfile.goreleaser
-    platforms:
-      - linux/amd64
-      - linux/arm64
-    tags:
-      - "v{{.Version}}"
-      - latest
-      - "v{{.Major}}.{{.Minor}}"
-    sbom: true
-    labels:
-      "org.opencontainers.image.description": "Web UI for controlling KEF W2 speakers"
-      "org.opencontainers.image.created": "{{.Date}}"
-      "org.opencontainers.image.name": "{{.ProjectName}}"
-      "org.opencontainers.image.revision": "{{.FullCommit}}"
-      "org.opencontainers.image.version": "{{.Version}}"
-      "org.opencontainers.image.source": "{{.GitURL}}"
-
 snapshot:
   version_template: "{{ incpatch .Version }}"