From 5ce153b24f6f46d9bff3553872f3300db4a58233 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Tue, 10 Feb 2026 22:49:38 +0100 Subject: [PATCH] ci: simplify secrets mapping and remove --wait from docker compose to avoid runner kills --- .gitea/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index db72a2ca..69bf7e29 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -183,8 +183,8 @@ jobs: DIRECTUS_HOST: cms.${{ needs.prepare.outputs.traefik_host }} # Secrets mapping (Directus) - DIRECTUS_KEY: ${{ secrets.DIRECTUS_KEY || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_KEY || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_KEY || secrets.TESTING_DIRECTUS_KEY || secrets.DIRECTUS_KEY)) }} - DIRECTUS_SECRET: ${{ secrets.DIRECTUS_SECRET || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_SECRET || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_SECRET || secrets.TESTING_DIRECTUS_SECRET || secrets.DIRECTUS_SECRET)) }} + DIRECTUS_KEY: ${{ secrets.DIRECTUS_KEY || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_KEY) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_KEY) || secrets.TESTING_DIRECTUS_KEY || secrets.DIRECTUS_KEY }} + DIRECTUS_SECRET: ${{ secrets.DIRECTUS_SECRET || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_SECRET) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_SECRET) || secrets.TESTING_DIRECTUS_SECRET || secrets.DIRECTUS_SECRET }} DIRECTUS_ADMIN_EMAIL: ${{ secrets.DIRECTUS_ADMIN_EMAIL || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_ADMIN_EMAIL || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_EMAIL || secrets.TESTING_DIRECTUS_ADMIN_EMAIL || secrets.DIRECTUS_ADMIN_EMAIL)) }} DIRECTUS_ADMIN_PASSWORD: ${{ secrets.DIRECTUS_ADMIN_PASSWORD || (needs.prepare.outputs.target == 'production' && secrets.DIRECTUS_ADMIN_PASSWORD || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_PASSWORD || secrets.TESTING_DIRECTUS_ADMIN_PASSWORD || secrets.DIRECTUS_ADMIN_PASSWORD)) }} DIRECTUS_DB_NAME: ${{ secrets.DIRECTUS_DB_NAME || 'directus' }} @@ -276,7 +276,7 @@ jobs: cd /home/deploy/sites/klz-cables.com echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '${{ needs.prepare.outputs.env_file }}' pull - docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '${{ needs.prepare.outputs.env_file }}' up -d --wait --remove-orphans + docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '${{ needs.prepare.outputs.env_file }}' up -d --remove-orphans # Apply Directus Schema Snapshot if available if docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '${{ needs.prepare.outputs.env_file }}' exec -T directus ls /directus/schema/snapshot.yaml >/dev/null 2>&1; then