From 0c02962b988a21c9374e6aa36ffb98bd3fa1440f Mon Sep 17 00:00:00 2001 From: Flea Flicker Date: Sat, 23 May 2026 16:07:50 +0000 Subject: [PATCH 1/2] fix(ci): push Docker images to git.farh.net registry (CAR-964) Co-Authored-By: Paperclip --- .gitea/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index b77c628..2c9b047 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -16,7 +16,7 @@ permissions: security-events: write env: - REGISTRY: ghcr.io + REGISTRY: git.farh.net IMAGE_NAME: cartsnitch/app jobs: @@ -140,13 +140,13 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Log in to GHCR + - name: Log in to Gitea Container Registry if: github.event_name == 'push' uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GITEA_TOKEN }} - name: Extract metadata id: meta @@ -232,7 +232,7 @@ jobs: if: needs.build-and-push.result == 'success' run: | cd infra/apps/overlays/dev - kustomize edit set image ghcr.io/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }} + kustomize edit set image git.farh.net/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }} - name: Commit and push to infra run: | @@ -276,7 +276,7 @@ jobs: if: needs.build-and-push.result == 'success' run: | cd infra/apps/overlays/uat - kustomize edit set image ghcr.io/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }} + kustomize edit set image git.farh.net/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }} - name: Commit and push to infra run: | From 43d3a0d2355b978d198e9aabfd1c0e402d0db0d2 Mon Sep 17 00:00:00 2001 From: Barcode Betty Date: Sun, 24 May 2026 18:40:48 +0000 Subject: [PATCH 2/2] ci: remove Docker Hub login, use REGISTRY_TOKEN for Gitea auth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes CAR-1009. - Remove Docker Hub login step (not needed) - Rename 'Log in to GHCR' → 'Log in to Gitea Container Registry' - Use REGISTRY_TOKEN instead of GITEA_TOKEN for Gitea auth Co-Authored-By: Paperclip --- .gitea/workflows/ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 03706a6..c662448 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -99,20 +99,13 @@ jobs: echo "version=$VERSION" >> "$GITHUB_OUTPUT" echo "CalVer tag: $VERSION" - - name: Log in to Docker Hub - if: github.event_name == 'push' - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Log in to Gitea Container Registry if: github.event_name == 'push' uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITEA_TOKEN }} + password: ${{ secrets.REGISTRY_TOKEN }} - name: Extract metadata id: meta