chore: align deployment standards with mb-grid-solutions 1:1
Some checks failed
Build & Deploy / 🔍 Prepare Environment (push) Successful in 11s
Build & Deploy / 🧪 QA (push) Successful in 3m50s
Build & Deploy / 🏗️ Build (push) Successful in 7m5s
Build & Deploy / 🚀 Deploy (push) Successful in 13s
Build & Deploy / 🔔 Notifications (push) Successful in 2s
Build & Deploy / ⚡ PageSpeed (push) Failing after 49s

This commit is contained in:
2026-02-09 10:59:44 +01:00
parent f6bff50434
commit 41b592fbe0
2 changed files with 17 additions and 11 deletions

View File

@@ -138,9 +138,9 @@ jobs:
# Determine middleware
if [[ "$TARGET" == "production" ]]; then
echo "auth_middleware=compress" >> "$GITHUB_OUTPUT"
echo "traefik_middlewares=compress" >> "$GITHUB_OUTPUT"
else
echo "auth_middleware=$PRJ_ID-$TARGET-auth" >> "$GITHUB_OUTPUT"
echo "traefik_middlewares=$PRJ_ID-$TARGET-auth" >> "$GITHUB_OUTPUT"
fi
qa:
@@ -270,7 +270,8 @@ jobs:
GATEKEEPER_PASSWORD=${{ secrets.GATEKEEPER_PASSWORD || vars.GATEKEEPER_PASSWORD || 'mintel' }}
AUTH_COOKIE_NAME=${{ secrets.AUTH_COOKIE_NAME || vars.AUTH_COOKIE_NAME || 'mintel_gatekeeper_session' }}
COOKIE_DOMAIN=${{ secrets.COOKIE_DOMAIN || vars.COOKIE_DOMAIN || '.mintel.me' }}
AUTH_MIDDLEWARE=${{ needs.prepare.outputs.auth_middleware }}
TRAEFIK_MIDDLEWARES=${{ needs.prepare.outputs.traefik_middlewares }}
AUTH_MIDDLEWARE=${{ needs.prepare.outputs.traefik_middlewares }}
# External Services
SENTRY_DSN=${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }}

View File

@@ -8,16 +8,16 @@ services:
- ${ENV_FILE:-.env}
labels:
- "traefik.enable=true"
- "traefik.http.routers.${PROJECT_NAME}.rule=${TRAEFIK_RULE}"
- "traefik.http.routers.${PROJECT_NAME}.rule=${TRAEFIK_RULE:-Host(`${TRAEFIK_HOST:-mintel.me.localhost}`)}"
- "traefik.http.routers.${PROJECT_NAME}.entrypoints=websecure"
- "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=${AUTH_MIDDLEWARE}"
- "traefik.http.routers.${PROJECT_NAME}.middlewares=${TRAEFIK_MIDDLEWARES:-${PROJECT_NAME}-auth}"
- "traefik.docker.network=infra"
# Gatekeeper Router
- "traefik.http.routers.${PROJECT_NAME}-gatekeeper.rule=${GATEKEEPER_RULE}"
# Gatekeeper Router (Shared Host + dedicated Subdomain)
- "traefik.http.routers.${PROJECT_NAME}-gatekeeper.rule=${GATEKEEPER_RULE:-(Host(`${TRAEFIK_HOST:-mintel.me.localhost}`) && PathPrefix(`/gatekeeper`)) || Host(`gatekeeper.${TRAEFIK_HOST:-mintel.me.localhost}`)}"
- "traefik.http.routers.${PROJECT_NAME}-gatekeeper.entrypoints=websecure"
- "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls.certresolver=le"
- "traefik.http.routers.${PROJECT_NAME}-gatekeeper.tls=true"
@@ -30,6 +30,7 @@ services:
gatekeeper:
image: registry.infra.mintel.me/mintel/gatekeeper:latest
container_name: ${PROJECT_NAME:-mintel-me}-gatekeeper
restart: always
networks:
infra:
@@ -38,7 +39,7 @@ services:
env_file:
- ${ENV_FILE:-.env}
environment:
PORT: 3000
PORT: ${PORT:-3000}
PROJECT_NAME: ${PROJECT_NAME:-Mintel.me}
PROJECT_COLOR: ${PROJECT_COLOR:-#ff00ff}
COOKIE_DOMAIN: ${COOKIE_DOMAIN:-.mintel.me}
@@ -56,6 +57,7 @@ services:
restart: always
networks:
- infra
- backend
env_file:
- ${ENV_FILE:-.env}
environment:
@@ -79,19 +81,20 @@ services:
start_period: 30s
labels:
- "traefik.enable=true"
- "traefik.http.routers.${PROJECT_NAME}-directus.rule=Host(`${DIRECTUS_HOST}`)"
- "traefik.http.routers.${PROJECT_NAME}-directus.rule=Host(`${DIRECTUS_HOST:-cms.mintel.me.localhost}`)"
- "traefik.http.routers.${PROJECT_NAME}-directus.entrypoints=websecure"
- "traefik.http.routers.${PROJECT_NAME}-directus.tls.certresolver=le"
- "traefik.http.routers.${PROJECT_NAME}-directus.tls=true"
- "traefik.http.routers.${PROJECT_NAME}-directus.middlewares=${AUTH_MIDDLEWARE}"
- "traefik.http.routers.${PROJECT_NAME}-directus.middlewares=${PROJECT_NAME}-forward,compress"
- "traefik.http.services.${PROJECT_NAME}-directus.loadbalancer.server.port=8055"
- "traefik.http.middlewares.${PROJECT_NAME}-forward.headers.customrequestheaders.X-Forwarded-Proto=https"
- "traefik.docker.network=infra"
directus-db:
image: postgres:15-alpine
restart: always
networks:
- infra
- backend
env_file:
- ${ENV_FILE:-.env}
environment:
@@ -104,6 +107,8 @@ services:
networks:
infra:
external: true
backend:
internal: true
volumes:
directus-db-data: