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
Merge remote-tracking branch 'origin/main' into uat-fresh
2026-06-23 00:19:02 +00:00 · 2026-06-23 00:16:40 +00:00 · 2026-06-23 00:14:25 +00:00 · 2026-06-22 23:40:03 +00:00 · 2026-06-22 23:26:26 +00:00 · 2026-06-22 23:25:50 +00:00
1 changed files with 19 additions and 9 deletions
@@ -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 }}
Author	SHA1	Message	Date
Barcode Betty	3a6190a805	Merge pull request 'Promote uat→main: CAR-994 Docker login fix + CAR-1423 REGISTRY_TOKEN fix' (#43 ) from uat into main CI / build-and-push (push) Successful in 11m44s Details CI / deploy-dev (push) Failing after 6s Details CI / deploy-uat (push) Failing after 7s Details Merge uat into main: CAR-994 Docker login fix + CAR-1423 two-stage build + CAR-1270 CI_GITEA_TOKEN fix	2026-06-23 00:19:02 +00:00
Barcode Betty	a2d18c18d8	Merge remote-tracking branch 'origin/main' into uat-fresh CI / build-and-push (push) Successful in 14s Details CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 5s Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details	2026-06-23 00:16:40 +00:00
Barcode Betty	b5151db0ac	fix: resolve ci.yml merge conflict (CAR-994+CAR-1423+CAR-1270) CI / deploy-dev (push) Has been cancelled Details CI / deploy-uat (push) Has been cancelled Details CI / build-and-push (push) Has been cancelled Details CI / deploy-dev (pull_request) Has been cancelled Details CI / deploy-uat (pull_request) Has been cancelled Details CI / build-and-push (pull_request) Has been cancelled Details	2026-06-23 00:14:25 +00:00
Barcode Betty	5cd46571f2	Merge pull request 'ci(CAR-1423): promote two-stage load->push fix to uat' (#42 ) from dev into uat CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 3s Details CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details CI / build-and-push (push) Successful in 9s Details ci(CAR-1423): promote two-stage load->push fix to uat (#42)	2026-06-22 23:40:03 +00:00
Barcode Betty	9c4f9b95a9	Merge pull request 'ci(CAR-1423): two-stage load->push to fix auth manifest push (unknown)' (#41 ) from betty/car-1423-two-stage-build into dev CI / build-and-push (push) Successful in 11s Details CI / deploy-uat (push) Has been skipped Details CI / deploy-dev (push) Failing after 3s Details CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details ci(CAR-1423): two-stage load->push to fix auth manifest push (#41)	2026-06-22 23:26:26 +00:00
Barcode Betty	e22010a907	ci(CAR-1423): two-stage load->push to fix auth manifest push (unknown) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details	2026-06-22 23:25:50 +00:00
Barcode Betty	5cdb4c63b8	Merge pull request 'ci(CAR-1423): disable provenance/sbom attestations on auth build-push' (#40 ) from betty/car-1423-disable-provenance into dev CI / build-and-push (push) Failing after 19s Details CI / deploy-uat (push) Has been skipped Details CI / deploy-dev (push) Successful in 2s Details ci(CAR-1423): disable provenance/sbom attestations on auth build-push (#40)	2026-06-22 22:25:35 +00:00
Barcode Betty	4819d9c7ac	ci(CAR-1423): disable provenance/sbom attestations on auth build-push CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details	2026-06-22 22:24:15 +00:00
Barcode Betty	1233d80c8f	Merge pull request 'ci(CAR-1373): apply dev's deploy-job restoration to uat (dev → uat promotion, 3-way resolved)' (#38 ) from car-1373-uat-merge-resolved into uat CI / build-and-push (push) Failing after 10s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Successful in 2s Details	2026-06-12 02:09:22 +00:00
Barcode Betty	89fb02cdea	ci(CAR-1373): apply dev's deploy-job restoration to uat (resolve 3-way) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details The dev→uat 3-way merge of ci.yml conflicts on: - CalVer logic (dev is the multi-line readable form) - ref: main vs parameterized expression (dev wins, per CAR-1374) - PR body base/head: dev wins (per CAR-1371 + acceptance criteria) - CAR-1216 comment: dev added, uat didn't have it Resolution: take dev's version of ci.yml (the corrected form per CAR-1373). cc @cpfarhood	2026-06-10 22:47:36 +00:00
Barcode Betty	76254d0dbb	Merge pull request 'ci(CAR-1373): re-add deploy-dev/deploy-uat with PR-based base=dev/uat' (#36 ) from betty/car-1373-add-pr-deploy-jobs into dev CI / deploy-uat (push) Has been skipped Details CI / build-and-push (push) Successful in 20s Details CI / deploy-dev (push) Failing after 4s Details CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details	2026-06-10 22:44:40 +00:00
Barcode Betty	c4536afa5f	ci(CAR-1373): re-add deploy-dev/deploy-uat with PR-based base=dev/uat CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details Add deploy-dev and deploy-uat jobs to cartsnitch/auth:dev. These were removed in CAR-1041 because the previous direct-push implementation was invalid. Re-add them in the post-CAR-1371+1374 frontend pattern: - base=dev / base=uat (was base=main in main, direct-push in uat) - parameterized ref matches PR base (CAR-1374 sibling) - head=cartsnitch:${BRANCH} (cross-repo PR head, matches frontend) - never-fail on merge outcome (CAR-1216) - request cs_savannah review per GitOps gate cc @cpfarhood	2026-06-10 22:43:33 +00:00
Savannah Savings	72f2568b68	Merge pull request 'fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270)' (#35 ) from betty/car-1270-ci-gitea-token-main into main CI / build-and-push (push) Successful in 2m5s Details CI / deploy-dev (push) Failing after 3s Details CI / deploy-uat (push) Failing after 3s Details	2026-06-05 05:12:45 +00:00
Barcode Betty	a0be839632	fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-05 00:53:43 +00:00
Savannah Savings	0977a7c3b3	Merge pull request 'ci(auth): migrate deploy-dev/deploy-uat to PR-bump + fix registry token (CAR-1263)' (#33 ) from cs_betty/car-1263-auth-pr-bump-main into main CI / build-and-push (push) Successful in 10s Details CI / deploy-dev (push) Failing after 34s Details CI / deploy-uat (push) Failing after 36s Details	2026-06-05 00:34:48 +00:00
Barcode Betty	21fba7a842	ci(auth): migrate deploy-dev/deploy-uat to PR-bump + fix registry token (CAR-1263) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details Migrates auth .gitea/workflows/ci.yml deploy-dev and deploy-uat jobs from direct 'git push origin main' to cartsnitch/infra to the CAR-1195 PR-bump pattern. Brings auth in line with cartsnitch/cartsnitch and stops the red deploy-dev/deploy-uat jobs on main pushes. Also fixes the registry-login password to use REGISTRY_TOKEN (CAR-1009 standard) instead of GITEA_TOKEN — uat already had this fix (CAR-1237); main was lagging. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-05 00:23:07 +00:00