diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 5e4c8f21..3e80aaa4 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -6,6 +6,13 @@ on: - main tags: - 'v*' + workflow_dispatch: + inputs: + skip_long_checks: + description: 'Lange Tests / Scans ΓΌberspringen? (Hotfix / Eilt!)' + required: false + type: boolean + default: false concurrency: group: ${{ github.workflow }} @@ -49,10 +56,10 @@ jobs: TARGET="testing" IMAGE_TAG="main-${SHORT_SHA}" ENV_FILE=".env.testing" - TRAEFIK_HOST='testing.klz-cables.com' + TRAEFIK_HOST='`testing.klz-cables.com`' NEXT_PUBLIC_BASE_URL="https://testing.klz-cables.com" DIRECTUS_URL="https://cms-testing.klz-cables.com" - DIRECTUS_HOST='cms-testing.klz-cables.com' + DIRECTUS_HOST='`cms-testing.klz-cables.com`' IS_PROD="false" GOTIFY_TITLE="πŸ§ͺ Testing-Deploy" GOTIFY_PRIORITY=4 @@ -61,10 +68,10 @@ jobs: TARGET="production" IMAGE_TAG="$TAG" ENV_FILE=".env.prod" - TRAEFIK_HOST="klz-cables.com', 'www.klz-cables.com" + TRAEFIK_HOST='`klz-cables.com`, `www.klz-cables.com`' NEXT_PUBLIC_BASE_URL="https://klz-cables.com" DIRECTUS_URL="https://cms.klz-cables.com" - DIRECTUS_HOST='cms.klz-cables.com' + DIRECTUS_HOST='`cms.klz-cables.com`' IS_PROD="true" GOTIFY_TITLE="πŸš€ Production-Release" GOTIFY_PRIORITY=6 @@ -72,10 +79,10 @@ jobs: TARGET="staging" IMAGE_TAG="$TAG" ENV_FILE=".env.staging" - TRAEFIK_HOST='staging.klz-cables.com' + TRAEFIK_HOST='`staging.klz-cables.com`' NEXT_PUBLIC_BASE_URL="https://staging.klz-cables.com" DIRECTUS_URL="https://cms-staging.klz-cables.com" - DIRECTUS_HOST='cms-staging.klz-cables.com' + DIRECTUS_HOST='`cms-staging.klz-cables.com`' IS_PROD="false" GOTIFY_TITLE="πŸ§ͺ Staging-Deploy (Pre-Release)" GOTIFY_PRIORITY=5 @@ -131,11 +138,13 @@ jobs: run: npm ci - name: πŸ” Lint & Typecheck + if: github.event.inputs.skip_long_checks != 'true' run: | npm run lint npm run typecheck - name: πŸ§ͺ Test + if: github.event.inputs.skip_long_checks != 'true' run: npm run test # ────────────────────────────────────────────────────────────────────────────── diff --git a/docker-compose.yml b/docker-compose.yml index 9e55f704..a660d744 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,11 +9,11 @@ services: labels: - "traefik.enable=true" # HTTP β‡’ HTTPS redirect - - "traefik.http.routers.klz-cables-web.rule=Host('${TRAEFIK_HOST}') && !PathPrefix(`/.well-known/acme-challenge/`)" + - "traefik.http.routers.klz-cables-web.rule=Host(${TRAEFIK_HOST}) && !PathPrefix(`/.well-known/acme-challenge/`)" - "traefik.http.routers.klz-cables-web.entrypoints=web" - "traefik.http.routers.klz-cables-web.middlewares=redirect-https" # HTTPS router - - "traefik.http.routers.klz-cables.rule=Host('${TRAEFIK_HOST}')" + - "traefik.http.routers.klz-cables.rule=Host(${TRAEFIK_HOST})" - "traefik.http.routers.klz-cables.entrypoints=websecure" - "traefik.http.routers.klz-cables.tls.certresolver=le" - "traefik.http.routers.klz-cables.tls=true" @@ -51,7 +51,7 @@ services: - ./directus/extensions:/directus/extensions labels: - "traefik.enable=true" - - "traefik.http.routers.klz-directus.rule=Host('${DIRECTUS_HOST}')" + - "traefik.http.routers.klz-directus.rule=Host(${DIRECTUS_HOST})" - "traefik.http.routers.klz-directus.entrypoints=websecure" - "traefik.http.routers.klz-directus.tls.certresolver=le" - "traefik.http.routers.klz-directus.tls=true"