Merge pull request 'fix: remove DinD/GHCR split to fix Docker socket and infra 403 [CAR-987]' (#19) from betty/car-987-fix-ci-docker-socket-and-infra-403 into dev
CI / lint (push) Successful in 13s
CI / audit (push) Successful in 12s
CI / audit (pull_request) Successful in 12s
CI / deploy-uat (pull_request) Has been skipped
CI / test (pull_request) Successful in 11s
CI / e2e (pull_request) Failing after 3s
CI / build-and-push (push) Failing after 8s
CI / lighthouse (push) Failing after 45s
CI / lighthouse (pull_request) Failing after 43s
CI / test (push) Successful in 11s
CI / lint (pull_request) Successful in 12s
CI / build-and-push (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
CI / e2e (push) Successful in 43s
CI / deploy-uat (push) Has been skipped
CI / deploy-dev (push) Failing after 2s

fix: remove DinD/GHCR split to fix Docker socket and infra 403 [CAR-987]

Consolidates build+push into single step (no DinD socket needed).
Switches infra checkout to secrets.GITEA_DEPLOY_KEY for cross-repo access.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit was merged in pull request #19.
This commit is contained in:
2026-05-23 19:35:14 +00:00
+4 -29
View File
@@ -158,33 +158,7 @@ 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 Docker image
uses: docker/build-push-action@v6
with:
context: .
load: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
target: prod
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Scan frontend image for vulnerabilities
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
if: github.event_name == 'push'
- name: Build and push Docker image
uses: docker/build-push-action@v6
with:
context: .
@@ -193,6 +167,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
target: prod
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Create git tag
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
@@ -209,7 +184,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.GITEA_TOKEN }}
token: ${{ secrets.GITEA_DEPLOY_KEY }}
ref: main
path: infra
@@ -253,7 +228,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.GITEA_TOKEN }}
token: ${{ secrets.GITEA_DEPLOY_KEY }}
ref: main
path: infra