diff --git a/.gitea/CI_TRIGGER.md b/.gitea/CI_TRIGGER.md new file mode 100644 index 0000000..b7eb537 --- /dev/null +++ b/.gitea/CI_TRIGGER.md @@ -0,0 +1 @@ +# CI trigger 20260525231507 - post-DinD verification (CAR-1042) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 5ed5cf5..6bba354 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -37,17 +37,17 @@ jobs: run: | DATE_TAG=$(date -u +%Y.%m.%d) EXISTING=$(git tag -l "v${DATE_TAG}*" | sort -V | tail -1) - if [ -z "$EXISTING" ]; then VERSION="$DATE_TAG" - elif [ "$EXISTING" = "v${DATE_TAG}" ]; then VERSION="${DATE_TAG}.2" - else BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))"; fi + if [ -z "$EXISTING" ]; then + VERSION="$DATE_TAG" + elif [ "$EXISTING" = "v${DATE_TAG}" ]; then + VERSION="${DATE_TAG}.2" + 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 - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.REGISTRY_TOKEN }} + run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u "${{ github.actor }}" --password-stdin - name: Extract metadata id: meta @@ -59,11 +59,21 @@ 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 and push Docker image + - name: Build Docker image + uses: docker/build-push-action@v6 + with: + context: . + load: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + - name: Push Docker image uses: docker/build-push-action@v6 with: context: . push: true + provenance: false + sbom: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/src/auth.ts b/src/auth.ts index 09b493f..4a62b53 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -115,6 +115,9 @@ export const auth = betterAuth({ trustedOrigins: [ "http://localhost:3000", "http://localhost:5173", + "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",