From fd8f0685941b73b691e9d37dbc78a0a4569435f4 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Sat, 7 Feb 2026 09:40:09 +0100 Subject: [PATCH] fix: false gatekeeper on prod --- .gitea/workflows/deploy.yml | 5 +++++ docker-compose.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 20d3e39..f5bac00 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -29,6 +29,7 @@ jobs: gatekeeper_host: ${{ steps.determine.outputs.gatekeeper_host }} traefik_rule: ${{ steps.determine.outputs.traefik_rule }} gatekeeper_rule: ${{ steps.determine.outputs.gatekeeper_rule }} + traefik_middlewares: ${{ steps.determine.outputs.traefik_middlewares }} project_name: ${{ steps.determine.outputs.project_name }} steps: - name: 🔍 Debug Info @@ -114,9 +115,11 @@ jobs: if [[ "$TARGET" == "production" ]]; then TRAEFIK_RULE="Host(\`${DOMAIN_BASE}\`) || Host(\`www.${DOMAIN_BASE}\`)" GATEKEEPER_RULE="(Host(\`${DOMAIN_BASE}\`) || Host(\`www.${DOMAIN_BASE}\`)) && PathPrefix(\`/gatekeeper\`) || Host(\`gatekeeper.${DOMAIN_BASE}\`)" + TRAEFIK_MIDDLEWARES="compress" else TRAEFIK_RULE="Host(\`${TRAEFIK_HOST}\`)" GATEKEEPER_RULE="(Host(\`${TRAEFIK_HOST}\`) && PathPrefix(\`/gatekeeper\`)) || Host(\`gatekeeper.${TRAEFIK_HOST}\`)" + TRAEFIK_MIDDLEWARES="${PRJ_ID}-${TARGET}-auth" fi fi @@ -129,6 +132,7 @@ jobs: echo "traefik_host=$TRAEFIK_HOST" >> "$GITHUB_OUTPUT" echo "traefik_rule=$TRAEFIK_RULE" >> "$GITHUB_OUTPUT" echo "gatekeeper_rule=$GATEKEEPER_RULE" >> "$GITHUB_OUTPUT" + echo "traefik_middlewares=$TRAEFIK_MIDDLEWARES" >> "$GITHUB_OUTPUT" echo "gatekeeper_host=$GATEKEEPER_HOST" >> "$GITHUB_OUTPUT" echo "next_public_base_url=$NEXT_PUBLIC_BASE_URL" >> "$GITHUB_OUTPUT" echo "directus_url=$DIRECTUS_URL" >> "$GITHUB_OUTPUT" @@ -228,6 +232,7 @@ jobs: IMAGE_TAG=${{ needs.prepare.outputs.image_tag }} TRAEFIK_HOST=${{ needs.prepare.outputs.traefik_host }} TRAEFIK_RULE=${{ needs.prepare.outputs.traefik_rule }} + TRAEFIK_MIDDLEWARES=${{ needs.prepare.outputs.traefik_middlewares }} GATEKEEPER_RULE=${{ needs.prepare.outputs.gatekeeper_rule }} GATEKEEPER_HOST=${{ needs.prepare.outputs.gatekeeper_host }} PROJECT_NAME=${{ needs.prepare.outputs.project_name }} diff --git a/docker-compose.yaml b/docker-compose.yaml index 4695271..640a60a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: - "traefik.http.routers.${PROJECT_NAME}.tls.certresolver=le" - "traefik.http.routers.${PROJECT_NAME}.tls=true" - "traefik.http.services.${PROJECT_NAME}.loadbalancer.server.port=3000" - - "traefik.http.routers.${PROJECT_NAME}.middlewares=${PROJECT_NAME}-auth" + - "traefik.http.routers.${PROJECT_NAME}.middlewares=${TRAEFIK_MIDDLEWARES:-${PROJECT_NAME}-auth}" - "traefik.docker.network=infra" # Gatekeeper Router (Shared Host + dedicated Subdomain)