From ff2904f95d10eb51fd723c39c75992f598841f20 Mon Sep 17 00:00:00 2001
From: Anurag Bandyopadhyay <angbpy@gmail.com>
Date: Wed, 18 Feb 2026 23:47:16 +0530
Subject: [PATCH 1/2] fix: goreleaser distroless provenance

---
 .goreleaser.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 4e73e01b..2404f5da 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -39,9 +39,11 @@ dockers:
       - "openfga/cli:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64"
 
     use: buildx
+
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--pull"
+      - "--provenance=false"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
@@ -64,6 +66,8 @@ dockers:
 
     build_flag_templates:
       - "--platform=linux/arm64"
+      - "--pull"
+      - "--provenance=false"
 
 docker_manifests:
   - name_template: openfga/cli:latest

From a5fa40eb007478bf3a2bc74469ec03c61a7fd5d0 Mon Sep 17 00:00:00 2001
From: Anurag Bandyopadhyay <angbpy@gmail.com>
Date: Thu, 19 Feb 2026 16:30:54 +0530
Subject: [PATCH 2/2] feat: use dockers v2 to mitigate the issue

---
 .goreleaser.Dockerfile |  3 +-
 .goreleaser.yaml       | 81 ++++++++++--------------------------------
 2 files changed, 21 insertions(+), 63 deletions(-)

diff --git a/.goreleaser.Dockerfile b/.goreleaser.Dockerfile
index bbd7715f..0a950932 100644
--- a/.goreleaser.Dockerfile
+++ b/.goreleaser.Dockerfile
@@ -1,3 +1,4 @@
 FROM gcr.io/distroless/static:nonroot
-COPY fga /fga
+ARG TARGETPLATFORM
+COPY ${TARGETPLATFORM}/fga /fga
 ENTRYPOINT ["/fga"]
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 2404f5da..8c0a070e 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -24,72 +24,29 @@ builds:
       - "-X github.com/openfga/cli/internal/build.Commit={{.Commit}}"
       - "-X github.com/openfga/cli/internal/build.Date={{.Date}}"
 
-dockers:
-  - goos: linux
-    goarch: amd64
-
-    dockerfile: .goreleaser.Dockerfile
-
-    image_templates:
-      - "openfga/cli:latest-amd64"
-      - "openfga/cli:{{ .Tag }}-amd64"
-      - "openfga/cli:v{{ .Version }}-amd64"
-      - "openfga/cli:v{{ .Major }}-amd64"
-      - "openfga/cli:v{{ .Major }}.{{ .Minor }}-amd64"
-      - "openfga/cli:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64"
-
-    use: buildx
-
-    build_flag_templates:
-      - "--platform=linux/amd64"
-      - "--pull"
-      - "--provenance=false"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
-
-  - goos: linux
-    goarch: arm64
-
+dockers_v2:
+  - images:
+      - "openfga/cli"
     dockerfile: .goreleaser.Dockerfile
 
-    image_templates:
-      - "openfga/cli:latest-arm64"
-      - "openfga/cli:{{ .Tag }}-arm64"
-      - "openfga/cli:v{{ .Version }}-arm64"
-      - "openfga/cli:v{{ .Major }}-arm64"
-      - "openfga/cli:v{{ .Major }}.{{ .Minor }}-arm64"
-      - "openfga/cli:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64"
+    platforms:
+      - linux/amd64
+      - linux/arm64
 
-    use: buildx
+    tags:
+      - "latest"
+      - "{{ .Tag }}"
+      - "v{{ .Version }}"
+      - "v{{ .Major }}"
+      - "v{{ .Major }}.{{ .Minor }}"
+      - "v{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
 
-    build_flag_templates:
-      - "--platform=linux/arm64"
-      - "--pull"
-      - "--provenance=false"
+    labels:
+      "org.opencontainers.image.created": "{{.Date}}"
+      "org.opencontainers.image.title": "{{.ProjectName}}"
+      "org.opencontainers.image.revision": "{{.FullCommit}}"
+      "org.opencontainers.image.version": "{{.Version}}"
 
-docker_manifests:
-  - name_template: openfga/cli:latest
-    image_templates:
-      - openfga/cli:latest-amd64
-      - openfga/cli:latest-arm64
-  - name_template: openfga/cli:v{{ .Version }}
-    image_templates:
-      - openfga/cli:v{{ .Version }}-amd64
-      - openfga/cli:v{{ .Version }}-arm64
-  - name_template: openfga/cli:v{{ .Major }}
-    image_templates:
-      - openfga/cli:v{{ .Major }}-amd64
-      - openfga/cli:v{{ .Major }}-arm64
-  - name_template: openfga/cli:v{{ .Major }}.{{ .Minor }}
-    image_templates:
-      - openfga/cli:v{{ .Major }}.{{ .Minor }}-amd64
-      - openfga/cli:v{{ .Major }}.{{ .Minor }}-arm64
-  - name_template: openfga/cli:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}
-    image_templates:
-      - openfga/cli:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64
-      - openfga/cli:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64
 
 release:
   github:
@@ -249,7 +206,7 @@ checksum:
     - glob: manpages/*
 
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 
 report_sizes: true