Compare commits

..

1 Commits

Author SHA1 Message Date
Flea Flicker 89ef66fdb7 fix: use GHCR_PAT for GHCR login in CI workflow [CAR-931]
CI / build-and-push (pull_request) Has been skipped
CI / deploy-dev (pull_request) Has been skipped
CI / deploy-uat (pull_request) Has been skipped
2026-05-23 14:59:29 +00:00
3 changed files with 14 additions and 18 deletions
-1
View File
@@ -1 +0,0 @@
# CI trigger 20260525231507 - post-DinD verification (CAR-1042)
+13 -14
View File
@@ -16,20 +16,13 @@ permissions:
security-events: write
env:
REGISTRY: git.farh.net
REGISTRY: ghcr.io
IMAGE_NAME: cartsnitch/auth
jobs:
build-and-push:
runs-on: ubuntu-latest
if: github.event_name == 'push'
services:
docker:
image: docker:dind
privileged: true
env:
DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
outputs:
calver_tag: ${{ steps.calver.outputs.version }}
sha_tag: sha-${{ github.sha }}
@@ -49,8 +42,12 @@ jobs:
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
run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
- name: Log in to GHCR
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: cartsnitch
password: ${{ secrets.GHCR_PAT }}
- name: Extract metadata
id: meta
@@ -69,6 +66,8 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
- name: Create git tag
if: github.ref == 'refs/heads/main'
@@ -84,7 +83,7 @@ jobs:
- uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.REGISTRY_TOKEN }}
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
@@ -102,7 +101,7 @@ jobs:
- name: Update auth image tag in dev overlay
run: |
cd infra/apps/overlays/dev
kustomize edit set image ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:${{ steps.tag.outputs.tag }}
kustomize edit set image ghcr.io/cartsnitch/auth:${{ steps.tag.outputs.tag }}
- name: Commit and push to infra
run: |
@@ -123,7 +122,7 @@ jobs:
- uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.REGISTRY_TOKEN }}
token: ${{ secrets.GITEA_TOKEN }}
ref: main
path: infra
@@ -141,7 +140,7 @@ jobs:
- name: Update auth image tag in uat overlay
run: |
cd infra/apps/overlays/uat
kustomize edit set image ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:${{ steps.tag.outputs.tag }}
kustomize edit set image ghcr.io/cartsnitch/auth:${{ steps.tag.outputs.tag }}
- name: Commit and push to infra
run: |
+1 -3
View File
@@ -115,11 +115,9 @@ export const auth = betterAuth({
trustedOrigins: [
"http://localhost:3000",
"http://localhost:5173",
"https://cartsnitch.com",
"https://cartsnitch.farh.net",
"https://cartsnitch.dev.farh.net",
"https://cartsnitch.uat.farh.net",
"https://cartsnitch.com",
"https://dev.cartsnitch.com",
"https://uat.cartsnitch.com",
],
});