Merge pull request 'Promote uat→main: CAR-994 Docker login fix + CAR-1423 REGISTRY_TOKEN fix' (#43) from uat into main

Merge uat into main: CAR-994 Docker login fix + CAR-1423 two-stage build + CAR-1270 CI_GITEA_TOKEN fix

.gitea/workflows/ci.yml

@@ -37,17 +37,17 @@ jobs:
         run: |
           DATE_TAG=$(date -u +%Y.%m.%d)
           EXISTING=$(git tag -l "v${DATE_TAG}*" | sort -V | tail -1)
-          if [ -z "$EXISTING" ]; then VERSION="$DATE_TAG"
-          elif [ "$EXISTING" = "v${DATE_TAG}" ]; then VERSION="${DATE_TAG}.2"
-          else BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))"; fi
+          if [ -z "$EXISTING" ]; then
+            VERSION="$DATE_TAG"
+          elif [ "$EXISTING" = "v${DATE_TAG}" ]; then
+            VERSION="${DATE_TAG}.2"
+          else
+            BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))";
+          fi
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
+        run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u "${{ github.actor }}" --password-stdin
 
       - name: Extract metadata
         id: meta
@@ -59,11 +59,21 @@ jobs:
             type=raw,value=${{ steps.calver.outputs.version }},enable=${{ github.ref == 'refs/heads/main' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
 
-      - name: Build and push Docker image
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          load: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
+          provenance: false
+          sbom: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -82,7 +92,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: cartsnitch/infra
-          token: ${{ secrets.GITEA_TOKEN }}
+          token: ${{ secrets.CI_GITEA_TOKEN }}
           ref: main
           path: infra
 
@@ -116,7 +126,7 @@ jobs:
       - name: Commit and push to infra (via PR)
         if: needs.build-and-push.result == 'success'
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
         run: |
           set -euo pipefail
           cd infra
@@ -135,7 +145,7 @@ jobs:
           PR_BODY=$(jq -n --arg head "$BRANCH" --arg body "Bumps apps/overlays/dev/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
             '{head: $head, base: "main", title: ("ci(dev): update auth image (" + env.GITHUB_SHA[:12] + ")"), body: $body}')
           PR_JSON=$(curl -sS -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d "$PR_BODY" \
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
@@ -146,7 +156,7 @@ jobs:
           fi
           echo "Opened cartsnitch/infra PR #${PR_NUM}"
           REVIEW_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d '{"reviewers":["cs_savannah"]}' \
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/requested_reviewers")
@@ -154,7 +164,7 @@ jobs:
             echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
           fi
           MERGE_RESP=$(curl -sS -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d '{"Do":"merge","delete_branch_after_merge":true}' \
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
@@ -181,7 +191,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: cartsnitch/infra
-          token: ${{ secrets.GITEA_TOKEN }}
+          token: ${{ secrets.CI_GITEA_TOKEN }}
           ref: main
           path: infra
 
@@ -215,7 +225,7 @@ jobs:
       - name: Commit and push to infra (via PR)
         if: needs.build-and-push.result == 'success'
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
         run: |
           set -euo pipefail
           cd infra
@@ -234,7 +244,7 @@ jobs:
           PR_BODY=$(jq -n --arg head "$BRANCH" --arg body "Bumps apps/overlays/uat/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
             '{head: $head, base: "main", title: ("ci(uat): update auth image (" + env.GITHUB_SHA[:12] + ")"), body: $body}')
           PR_JSON=$(curl -sS -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d "$PR_BODY" \
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
@@ -245,7 +255,7 @@ jobs:
           fi
           echo "Opened cartsnitch/infra PR #${PR_NUM}"
           REVIEW_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d '{"reviewers":["cs_savannah"]}' \
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/requested_reviewers")
@@ -253,7 +263,7 @@ jobs:
             echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
           fi
           MERGE_RESP=$(curl -sS -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
             -d '{"Do":"merge","delete_branch_after_merge":true}' \
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")