From fcc4ac57ca50a6fdddf823b6913df4464835ca53 Mon Sep 17 00:00:00 2001
From: Antoine Aflalo <197810+Belphemur@users.noreply.github.com>
Date: Tue, 26 Aug 2025 23:08:08 -0400
Subject: [PATCH] fix(ci): rollback to docker config instead of docker_v2

---
 .goreleaser.yml | 55 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0ce3d47..9cf8c35 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -65,25 +65,34 @@ sboms:
   - artifacts: archive
   - id: source # Two different sbom configurations need two different IDs
     artifacts: source
-# create docker images
+# create a docker image
 # https://goreleaser.com/customization/docker
-dockers_v2:
-  - images:
-      - "ghcr.io/belphemur/cbzoptimizer"
-    tags:
-      - "{{ .Version }}"
-      - "latest"
-    platforms:
-      - "linux/amd64"
-      - "linux/arm64"
-    labels:
-      "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}}"
-      "org.opencontainers.image.authors": "Belphemur"
-      "org.opencontainers.image.description": "CBZOptimizer is a Go-based tool designed to optimize CBZ (Comic Book Zip) and CBR (Comic Book RAR) files by converting images to a specified format and quality. This tool is useful for reducing the size of comic book archives while maintaining acceptable image quality."
+dockers:
+  - image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:latest-amd64"
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-amd64"
+    use: buildx
+    build_flag_templates:
+      - "--pull"
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+  - image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:latest-arm64"
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-arm64"
+    use: buildx
+    goarch: arm64
+    build_flag_templates:
+      - "--pull"
+      - "--platform=linux/arm64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
 # signs the checksum file
 # all files (including the sboms) are included in the checksum, so we don't need to sign each one if we don't want to
 # https://goreleaser.com/customization/sign
@@ -106,8 +115,18 @@ docker_signs:
   - cmd: cosign
     env:
       - COSIGN_EXPERIMENTAL=1
+    artifacts: images
     output: true
     args:
       - "sign"
       - "${artifact}"
       - "--yes" # needed on cosign 2.0.0+
+docker_manifests:
+  - name_template: "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}"
+    image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-amd64"
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-arm64"
+  - name_template: "ghcr.io/belphemur/cbzoptimizer:latest"
+    image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:latest-amd64"
+      - "ghcr.io/belphemur/cbzoptimizer:latest-arm64"