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

@@ -67,31 +67,11 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Scan Docker image
-        uses: anchore/scan-action@v5
-        id: scan
-        env:
-          GRYPE_CONFIG: .grype.yaml
-        with:
-          image: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${{ github.sha }}"
-          fail-build: true
-          severity-cutoff: high
-          only-fixed: "true"
-          output-format: sarif
-
       - name: Push Docker image
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          # CAR-1446: git.farh.net does not implement the OCI referrers API.
-          # Verified 2026-06-23: GET /v2/cartsnitch/auth/referrers/{digest} →
-          # HTTP 404 "page not found" (plain proxy 404, not an OCI error — the path
-          # does not exist in this Gitea registry version). OCI Distribution Spec
-          # >=1.1 is required for provenance/SBOM attestation manifests; without it
-          # the docker/build-push-action would fail at the attestation PUT.
-          # Compensating control: the Grype scan step above fails the build on any
-          # unfixed HIGH-severity CVE before the image reaches the registry.
           provenance: false
           sbom: false
           tags: ${{ steps.meta.outputs.tags }}
@@ -113,7 +93,7 @@ jobs:
         with:
           repository: cartsnitch/infra
           token: ${{ secrets.CI_GITEA_TOKEN }}
-          ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
+          ref: main
           path: infra
 
       - name: Install kustomize
@@ -162,9 +142,8 @@ jobs:
             echo "::notice::Refusing to push directly to protected branch — falling back to contents API"
             exit 0
           fi
-          TITLE="ci(dev): update auth image (${GITHUB_SHA::12})"
+          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." \
-          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base main --arg title "$TITLE" --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}')
-            '{head: $head, base: $base, title: $title, body: $body}')
           PR_JSON=$(curl -sS -X POST \
             -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
@@ -184,11 +163,6 @@ jobs:
           if [ "${REVIEW_HTTP}" -lt 200 ] || [ "${REVIEW_HTTP}" -ge 300 ]; then
             echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
           fi
-          # CAR-1216: the in-job merge attempt is a best-effort fast-path only.
-          # `cartsnitch/infra` main requires a human approving review; the CI bot
-          # cannot self-approve. Treat any non-merged outcome (approvals pending,
-          # checks pending, any other Gitea message) as the GitOps approval gate
-          # — the PR is already opened and cs_savannah is requested as reviewer.
           MERGE_RESP=$(curl -sS -X POST \
             -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
@@ -196,12 +170,16 @@ jobs:
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
           MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
           if [ "$MERGED" = "true" ]; then
-            echo "PR #${PR_NUM} merged into cartsnitch/infra dev"
+            echo "PR #${PR_NUM} merged into cartsnitch/infra main"
-          else
+          elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
-            # CAR-1438: PR opened successfully; any non-merged outcome (empty body,
+            # GitOps approval gate: PR is correctly opened and surfaces in
-            # approval-gate, pending checks) is the GitOps gate — not a failure.
+            # CTO queue via the reviewers request above. Treat as success
-            echo "::notice::infra PR #${PR_NUM} opened — auto-merge not available (${MERGE_RESP:-empty response}); awaiting CTO (cs_savannah) approve+merge"
+            # so the job does not hard-fail on approvals.
+            echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
             exit 0
+          else
+            echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
+            exit 1
           fi
 
   deploy-uat:
@@ -214,7 +192,7 @@ jobs:
         with:
           repository: cartsnitch/infra
           token: ${{ secrets.CI_GITEA_TOKEN }}
-          ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
+          ref: main
           path: infra
 
       - name: Install kustomize
@@ -263,9 +241,8 @@ jobs:
             echo "::notice::Refusing to push directly to protected branch — falling back to contents API"
             exit 0
           fi
-          TITLE="ci(uat): update auth image (${GITHUB_SHA::12})"
+          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." \
-          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base main --arg title "$TITLE" --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}')
-            '{head: $head, base: $base, title: $title, body: $body}')
           PR_JSON=$(curl -sS -X POST \
             -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
@@ -285,7 +262,6 @@ jobs:
           if [ "${REVIEW_HTTP}" -lt 200 ] || [ "${REVIEW_HTTP}" -ge 300 ]; then
             echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
           fi
-          # CAR-1216: see deploy-dev — same never-fail on merge outcome.
           MERGE_RESP=$(curl -sS -X POST \
             -H "Authorization: token ${CI_GITEA_TOKEN}" \
             -H "Content-Type: application/json" \
@@ -293,11 +269,14 @@ jobs:
             "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
           MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
           if [ "$MERGED" = "true" ]; then
-            echo "PR #${PR_NUM} merged into cartsnitch/infra uat"
+            echo "PR #${PR_NUM} merged into cartsnitch/infra main"
-          else
+          elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
-            # CAR-1438: PR opened successfully; any non-merged outcome (empty body,
+            # GitOps approval gate: PR is correctly opened and surfaces in
-            # approval-gate, pending checks) is the GitOps gate — not a failure.
+            # CTO queue via the reviewers request above. Treat as success
-            echo "::notice::infra PR #${PR_NUM} opened — auto-merge not available (${MERGE_RESP:-empty response}); awaiting CTO (cs_savannah) approve+merge"
+            # so the job does not hard-fail on approvals.
+            echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
             exit 0
+          else
+            echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
+            exit 1
           fi
-

package-lock.json

@@ -818,9 +818,9 @@
       }
     },
     "node_modules/defu": {
-      "version": "6.1.7",
+      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
-      "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
+      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
       "license": "MIT"
     },
     "node_modules/esbuild": {
@@ -909,9 +909,9 @@
       }
     },
     "node_modules/kysely": {
-      "version": "0.28.17",
+      "version": "0.28.14",
-      "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.17.tgz",
+      "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.14.tgz",
-      "integrity": "sha512-nbD8lB9EB3wNdMhOCdx5Li8DxnLbvKByylRLcJ1h+4SkrowVeECAyZlyiKMThF7xFdRz0jSQ2MoJr+wXux2y0Q==",
+      "integrity": "sha512-SU3lgh0rPvq7upc6vvdVrCsSMUG1h3ChvHVOY7wJ2fw4C9QEB7X3d5eyYEyULUX7UQtxZJtZXGuT6U2US72UYA==",
       "license": "MIT",
       "engines": {
         "node": ">=20.0.0"

package.json

@@ -21,10 +21,5 @@
     "@types/pg": "^8.11.0",
     "tsx": "^4.19.0",
     "typescript": "^5.7.0"
-  },
-  "overrides": {
-    "picomatch": "^4.0.4",
-    "defu": "^6.1.5",
-    "kysely": "^0.28.17"
   }
-}
+}