From c3f4465717942eda9be7d7a4d396cea3d68aab9e Mon Sep 17 00:00:00 2001
From: JBWatenbergScality
 <75977494+JBWatenbergScality@users.noreply.github.com>
Date: Fri, 18 Jul 2025 09:28:42 +0200
Subject: [PATCH 1/5] Update docker.yml

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 72b72cd..f19f1ad 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ github.token }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Export build information
         run: |

From 53be4058542c8402a14152599443360f6a42659b Mon Sep 17 00:00:00 2001
From: JBWatenbergScality
 <75977494+JBWatenbergScality@users.noreply.github.com>
Date: Fri, 18 Jul 2025 09:35:01 +0200
Subject: [PATCH 2/5] Update docker.yml

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f19f1ad..3fb278b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,7 +34,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     permissions:
-      contents: read
+      contents: write
       packages: write
       id-token: write # needed for provenance attestation
       attestations: write # needed for provenance attestation

From 684e6f4554877fe007fd0bb0a89c121ba317dfb6 Mon Sep 17 00:00:00 2001
From: JBWatenbergScality
 <75977494+JBWatenbergScality@users.noreply.github.com>
Date: Fri, 18 Jul 2025 09:55:42 +0200
Subject: [PATCH 3/5] Update docker.yml

---
 .github/workflows/docker.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3fb278b..eb05fa5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -42,9 +42,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Login to Registry
         uses: docker/login-action@v3
         with:
@@ -52,6 +49,9 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Export build information
         run: |
           echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
@@ -86,7 +86,7 @@ jobs:
           cache-to: type=gha,mode=max
           # outputs: type=image,name=ghcr.io/${{ github.repository }},push-by-digest=true,name-canonical=true,push=${{ inputs.push-image }}
           build-args: |
-            GH_TOKEN=${{ secrets.GH_PAT }}
+            GHI_TOKEN=${{ secrets.GH_PAT }}
             PRIVATE_REPO_HOST=github.com/scality
             BUILD_DATE=${{ fromJson(steps.meta.outputs.json)['org.opencontainers.image.created'] }}
             GIT_COMMIT=${{ github.sha }}

From 3c2e318f52a31de690c90f11442834560e3fd4a1 Mon Sep 17 00:00:00 2001
From: JBWatenbergScality
 <75977494+JBWatenbergScality@users.noreply.github.com>
Date: Fri, 18 Jul 2025 09:56:26 +0200
Subject: [PATCH 4/5] Update Dockerfile

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f2d3736..fce8cbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Build the manager binary
 FROM golang:1.24 AS builder
 
-ARG GH_TOKEN
+ARG GHI_TOKEN
 
 ARG PRIVATE_REPO_HOST=github.com/scality
 
@@ -12,8 +12,8 @@ WORKDIR /workspace
 
 RUN go env -w GOPRIVATE=${PRIVATE_REPO_HOST}
 
-RUN if [ -z "$GH_TOKEN" ]; then echo "GH_TOKEN is missing"; exit 1; fi && \
-    git config --global url."https://oauth2:${GH_TOKEN}@${PRIVATE_REPO_HOST}".insteadOf "https://${PRIVATE_REPO_HOST}"
+RUN if [ -z "$GHI_TOKEN" ]; then echo "GHI_TOKEN is missing"; exit 1; fi && \
+    git config --global url."https://oauth2:${GHI_TOKEN}@${PRIVATE_REPO_HOST}".insteadOf "https://${PRIVATE_REPO_HOST}"
 
 # Copy the Go Modules manifests
 COPY go.mod go.mod

From 1df9626981e5983f54556fdb86b6639a481f54d2 Mon Sep 17 00:00:00 2001
From: JBWatenbergScality
 <75977494+JBWatenbergScality@users.noreply.github.com>
Date: Fri, 18 Jul 2025 10:02:20 +0200
Subject: [PATCH 5/5] Update docker.yml

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index eb05fa5..a2e3f15 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -46,7 +46,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx