fix(ci): add git pull --rebase to deploy jobs to prevent race condition

Merge pull request #111 from cartsnitch/fix/ci-api-docker-context
fix(ci): correct API Docker build context to api/ directory
2026-04-03 17:19:57 +00:00 · 2026-04-03 17:12:38 +00:00 · 2026-04-03 17:07:03 +00:00 · 2026-04-03 13:34:21 +00:00
1 changed files with 4 additions and 2 deletions
@@ -334,8 +334,8 @@ jobs:
      - name: Build and push API Docker image
        uses: docker/build-push-action@v6
        with:
-          context: .
+          context: ./api
-          file: ./api/Dockerfile
+          file: ./Dockerfile
          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -399,6 +399,7 @@ jobs:
          git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
          git add apps/overlays/dev/kustomization.yaml
          git commit -m "ci(dev): update cartsnitch, auth, receiptwitness, and api images"
          git pull --rebase origin main
          git push origin main
  deploy-uat:
@@ -460,4 +461,5 @@ jobs:
          git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
          git add apps/overlays/uat/kustomization.yaml
          git commit -m "ci(uat): update cartsnitch, auth, receiptwitness, and api images"
          git pull --rebase origin main
          git push origin main
Author	SHA1	Message	Date
cartsnitch-engineer[bot]	d86c0001eb	fix(ci): add git pull --rebase to deploy jobs to prevent race condition	2026-04-03 17:19:57 +00:00
cartsnitch-cto[bot]	5cc2bb78e9	Merge pull request #111 from cartsnitch/fix/ci-api-docker-context fix(ci): correct API Docker build context to api/ directory	2026-04-03 17:12:38 +00:00
cartsnitch-engineer[bot]	c9075be6e0	fix(ci): correct API Docker build context to api/ directory	2026-04-03 17:07:03 +00:00
cartsnitch-engineer[bot]	6c297b5e81	fix: correct email-in-address format, remove dead code, update tests (#110 ) - Fix email format in AuthService.get_email_in_address to use receipts+{token}@receipts.cartsnitch.com (was broken: @email.cartsnitch.com) - Remove dead EmailInAddressResponse class and GET /auth/me/email-in-address endpoint from auth/routes.py (endpoint moved to routes/user.py) - Add instructions field to EmailInAddressResponse schema - Update routes/user.py to include instructions in the response - Update test URLs from /auth/me/email-in-address to /api/v1/me/email-in-address Co-authored-by: CartSnitch Engineer Bot <cartnoreply@cartsnitch.com> Co-authored-by: Paperclip <noreply@paperclip.ing>	2026-04-03 13:34:21 +00:00