Fix API crash: remove dead dispose_engine import

ImportError: cannot import name 'dispose_engine' from 'cartsnitch_api.database' The function does not exist and is unused - lifespan already calls close_db() directly. Co-Authored-By: Paperclip <noreply@paperclip.ing>
Merge pull request 'ci(CAR-933): migrate image registry from ghcr.io to Gitea' (#264 ) from carl/car-933-gitea-registry into dev
2026-05-23 15:11:00 +00:00 · 2026-05-23 14:35:15 +00:00 · 2026-05-23 14:29:45 +00:00 · 2026-05-23 14:27:24 +00:00 · 2026-05-23 14:20:38 +00:00 · 2026-05-21 19:19:20 +00:00
4 changed files with 32 additions and 33 deletions
@@ -16,7 +16,7 @@ permissions:
  security-events: write

 env:
-  REGISTRY: ghcr.io
+  REGISTRY: git.farh.net
  IMAGE_NAME: cartsnitch/cartsnitch
  RECEIPTWITNESS_IMAGE_NAME: cartsnitch/receiptwitness
  API_IMAGE_NAME: cartsnitch/api
@@ -134,13 +134,13 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Log in to GHCR
+      - name: Log in to Gitea registry
        if: github.event_name == 'push'
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}

      - name: Extract metadata
        id: meta
@@ -175,7 +175,7 @@ jobs:
          only-fixed: "true"
          output-format: sarif

-      
+

      - name: Push Docker image
        if: github.event_name == 'push'
@@ -224,13 +224,13 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Log in to GHCR
+      - name: Log in to Gitea registry
        if: github.event_name == 'push'
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}

      - name: Extract metadata
        id: meta
@@ -267,7 +267,7 @@ jobs:
          only-fixed: "true"
          output-format: sarif

-      
+

      - name: Push Docker image
        if: github.event_name == 'push'
@@ -312,13 +312,13 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Log in to GHCR
+      - name: Log in to Gitea registry
        if: github.event_name == 'push'
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}

      - name: Extract metadata (API)
        id: meta
@@ -355,7 +355,7 @@ jobs:
          only-fixed: "true"
          output-format: sarif

-      
+

      - name: Push Docker image
        if: github.event_name == 'push'
@@ -400,13 +400,13 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Log in to GHCR
+      - name: Log in to Gitea registry
        if: github.event_name == 'push'
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}

      - name: Extract metadata (auth)
        id: meta
@@ -443,7 +443,7 @@ jobs:
          only-fixed: "true"
          output-format: sarif

-      
+

      - name: Push Docker image
        if: github.event_name == 'push'
@@ -467,7 +467,7 @@ jobs:
        uses: actions/checkout@v4
        with:
          repository: cartsnitch/infra
-          token: ${{ secrets.GITEA_TOKEN }}
+          token: ${{ secrets.REGISTRY_TOKEN }}
          ref: main
          path: infra

@@ -490,7 +490,7 @@ jobs:
        if: needs.build-and-push.result == 'success'
        run: |
          cd infra/apps/overlays/dev
-          kustomize edit set image ghcr.io/cartsnitch/cartsnitch:${{ steps.frontend_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/cartsnitch=git.farh.net/cartsnitch/cartsnitch:${{ steps.frontend_tag.outputs.tag }}

      - name: Determine image tag for receiptwitness
        id: receiptwitness_tag
@@ -505,7 +505,7 @@ jobs:
        if: needs.build-and-push-receiptwitness.result == 'success'
        run: |
          cd infra/apps/overlays/dev
-          kustomize edit set image ghcr.io/cartsnitch/receiptwitness:${{ steps.receiptwitness_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/receiptwitness=git.farh.net/cartsnitch/receiptwitness:${{ steps.receiptwitness_tag.outputs.tag }}

      - name: Determine image tag for api
        id: api_tag
@@ -520,7 +520,7 @@ jobs:
        if: needs.build-and-push-api.result == 'success'
        run: |
          cd infra/apps/overlays/dev
-          kustomize edit set image ghcr.io/cartsnitch/api:${{ steps.api_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/api=git.farh.net/cartsnitch/api:${{ steps.api_tag.outputs.tag }}

      - name: Determine image tag for auth
        id: auth_tag
@@ -535,13 +535,13 @@ jobs:
        if: needs.build-and-push-auth.result == 'success'
        run: |
          cd infra/apps/overlays/dev
-          kustomize edit set image ghcr.io/cartsnitch/auth:${{ steps.auth_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:${{ steps.auth_tag.outputs.tag }}

      - name: Commit and push to infra
        run: |
          cd infra
          git config user.name "cartsnitch-ci[bot]"
-          git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
+          git config user.email "cartsnitch-ci[bot]@users.noreply.git.farh.net"
          git add apps/overlays/dev/kustomization.yaml
          git diff --cached --quiet && echo "No image changes to deploy" && exit 0
          git commit -m "ci(dev): update cartsnitch, receiptwitness, api, and auth images"
@@ -557,7 +557,7 @@ jobs:
        uses: actions/checkout@v4
        with:
          repository: cartsnitch/infra
-          token: ${{ secrets.GITEA_TOKEN }}
+          token: ${{ secrets.REGISTRY_TOKEN }}
          ref: main
          path: infra

@@ -580,7 +580,7 @@ jobs:
        if: needs.build-and-push.result == 'success'
        run: |
          cd infra/apps/overlays/uat
-          kustomize edit set image ghcr.io/cartsnitch/cartsnitch:${{ steps.frontend_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/cartsnitch=git.farh.net/cartsnitch/cartsnitch:${{ steps.frontend_tag.outputs.tag }}

      - name: Determine image tag for receiptwitness
        id: receiptwitness_tag
@@ -595,7 +595,7 @@ jobs:
        if: needs.build-and-push-receiptwitness.result == 'success'
        run: |
          cd infra/apps/overlays/uat
-          kustomize edit set image ghcr.io/cartsnitch/receiptwitness:${{ steps.receiptwitness_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/receiptwitness=git.farh.net/cartsnitch/receiptwitness:${{ steps.receiptwitness_tag.outputs.tag }}

      - name: Determine image tag for api
        id: api_tag
@@ -610,7 +610,7 @@ jobs:
        if: needs.build-and-push-api.result == 'success'
        run: |
          cd infra/apps/overlays/uat
-          kustomize edit set image ghcr.io/cartsnitch/api:${{ steps.api_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/api=git.farh.net/cartsnitch/api:${{ steps.api_tag.outputs.tag }}

      - name: Determine image tag for auth
        id: auth_tag
@@ -625,13 +625,13 @@ jobs:
        if: needs.build-and-push-auth.result == 'success'
        run: |
          cd infra/apps/overlays/uat
-          kustomize edit set image ghcr.io/cartsnitch/auth:${{ steps.auth_tag.outputs.tag }}
+          kustomize edit set image ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:${{ steps.auth_tag.outputs.tag }}

      - name: Commit and push to infra
        run: |
          cd infra
          git config user.name "cartsnitch-ci[bot]"
-          git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
+          git config user.email "cartsnitch-ci[bot]@users.noreply.git.farh.net"
          git add apps/overlays/uat/kustomization.yaml
          git diff --cached --quiet && echo "No image changes to deploy" && exit 0
          git commit -m "ci(uat): update cartsnitch, receiptwitness, api, and auth images"
@@ -15,7 +15,7 @@ permissions:
  packages: write

 env:
-  REGISTRY: ghcr.io
+  REGISTRY: git.farh.net
  IMAGE_NAME: cartsnitch/api

 jobs:
@@ -130,13 +130,13 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Log in to GHCR
+      - name: Log in to Gitea registry
        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.REGISTRY_TOKEN }}

      - name: Extract metadata
        id: meta
@@ -6,7 +6,6 @@ from fastapi import APIRouter, FastAPI

 from cartsnitch_api.auth.routes import router as auth_router
 from cartsnitch_api.cache import cache_client
-from cartsnitch_api.database import dispose_engine
 from cartsnitch_api.middleware.cors import add_cors_middleware
 from cartsnitch_api.middleware.error_handler import add_error_handlers, add_error_monitor_middleware
 from cartsnitch_api.middleware.rate_limit import add_rate_limit_middleware
Author	SHA1	Message	Date
Flea Flicker	5464e1a671	Fix API crash: remove dead dispose_engine import ImportError: cannot import name 'dispose_engine' from 'cartsnitch_api.database' The function does not exist and is unused - lifespan already calls close_db() directly. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-23 15:11:00 +00:00
Savannah Savings	9cc1e49d86	Merge pull request 'ci(CAR-933): migrate image registry from ghcr.io to Gitea' (#264 ) from carl/car-933-gitea-registry into dev Merge PR #264: Migrate CI from ghcr.io to Gitea package registry (CAR-955) Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-23 14:35:15 +00:00
Coupon Carl	2c4e9985b1	ci: rename GITEA_TOKEN -> REGISTRY_TOKEN to match configured secret name cpfarhood confirmed the Gitea registry token is configured as REGISTRY_TOKEN (not GITEA_TOKEN). This applies to both the registry docker login steps and the infra repo checkout steps in deploy-dev/deploy-uat. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-23 14:29:45 +00:00
cartsnitch-ci[bot]	821f1d20b3	fix(ci): replace hardcoded cs_carl username and fix kustomize image rename syntax - Replace hardcoded 'cs_carl' Gitea registry username with '${{ github.actor }}' in all 5 login steps - Use kustomize 'OLD=NEW:TAG' rename syntax so existing ghcr.io image entries are updated instead of duplicated Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-23 14:27:24 +00:00
Coupon Carl	555ced4fdc	ci: migrate image registry from ghcr.io to git.farh.net Replace GitHub Container Registry with Gitea's built-in container registry. - REGISTRY env var: ghcr.io -> git.farh.net - All 4 build-and-push jobs: replace GHCR login with Gitea registry login using cs_carl + GITEA_TOKEN (token already required for infra checkout) - deploy-dev/deploy-uat: update kustomize image refs to git.farh.net/* - Also fix legacy api/.gitea/workflows/ci.yml (non-executing nested file) Required secrets drop from 5 to 3: DOCKERHUB_USERNAME, DOCKERHUB_TOKEN, GITEA_TOKEN. GHCR_USERNAME and GHCR_TOKEN no longer needed. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-23 14:20:38 +00:00
Savannah Savings	4797f07af9	Merge pull request 'ci: move .github/workflows to .gitea/workflows [CAR-900]' (#259 ) from barcode-betty/move-workflows-to-gitea into dev Merge PR #259: ci: move .github/workflows to .gitea/workflows [CAR-897] QA-approved. CTO merge to dev. cc @cpfarhood	2026-05-21 19:19:20 +00:00
Flea Flicker	96331c9fa7	Move .github/workflows to .gitea/workflows - Relocate all CI workflows from .github/workflows/ to .gitea/workflows/ - Root: .github/workflows/ci.yml -> .gitea/workflows/ci.yml - api/: api/.github/workflows/ci.yml -> api/.gitea/workflows/ci.yml - common/: common/.github/workflows/ci.yml -> common/.gitea/workflows/ci.yml - Gitea uses .gitea/workflows/ for CI configuration Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-21 11:59:35 +00:00
Savannah Savings	a4e0b664e1	Merge pull request 'fix: use GHCR_USERNAME and GHCR_TOKEN for GHCR login in Gitea Actions' (#258 ) from betty/fix-gitea-ci-secrets into dev	2026-05-21 06:21:55 +00:00