From af1edd9ec66bd01d4d5f26a825125998ba954c62 Mon Sep 17 00:00:00 2001 From: Eric Gullickson <16152721+ericgullickson@users.noreply.github.com> Date: Wed, 4 Feb 2026 21:11:36 -0600 Subject: [PATCH] chore: sync prod deploy timers --- .gitea/workflows/production.yaml | 12 ++++++++---- docker-compose.blue-green.yml | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/production.yaml b/.gitea/workflows/production.yaml index 3f7d563..9a66943 100644 --- a/.gitea/workflows/production.yaml +++ b/.gitea/workflows/production.yaml @@ -21,6 +21,7 @@ env: DEPLOY_PATH: /opt/motovaultpro COMPOSE_FILE: docker-compose.yml COMPOSE_BLUE_GREEN: docker-compose.blue-green.yml + COMPOSE_PROD: docker-compose.prod.yml HEALTH_CHECK_TIMEOUT: "60" LOG_LEVEL: INFO @@ -96,6 +97,7 @@ jobs: config/ docker-compose.yml docker-compose.blue-green.yml + docker-compose.prod.yml sparse-checkout-cone-mode: false fetch-depth: 1 @@ -105,6 +107,7 @@ jobs: rsync -av --delete "$GITHUB_WORKSPACE/scripts/" "$DEPLOY_PATH/scripts/" cp "$GITHUB_WORKSPACE/docker-compose.yml" "$DEPLOY_PATH/" cp "$GITHUB_WORKSPACE/docker-compose.blue-green.yml" "$DEPLOY_PATH/" + cp "$GITHUB_WORKSPACE/docker-compose.prod.yml" "$DEPLOY_PATH/" - name: Generate logging configuration run: | @@ -118,8 +121,9 @@ jobs: - name: Inject secrets run: | - chmod +x "$GITHUB_WORKSPACE/scripts/inject-secrets.sh" - "$GITHUB_WORKSPACE/scripts/inject-secrets.sh" + cd "$DEPLOY_PATH" + chmod +x scripts/inject-secrets.sh + SECRETS_DIR="$DEPLOY_PATH/secrets/app" ./scripts/inject-secrets.sh env: POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_CLIENT_SECRET }} @@ -170,7 +174,7 @@ jobs: # --force-recreate ensures containers are recreated even if image tag is same # This prevents stale container content when image digest changes # Start shared OCR service and target stack - docker compose -f $COMPOSE_FILE -f $COMPOSE_BLUE_GREEN up -d --force-recreate \ + docker compose -f $COMPOSE_FILE -f $COMPOSE_BLUE_GREEN -f $COMPOSE_PROD up -d --force-recreate \ mvp-ocr mvp-frontend-$TARGET_STACK mvp-backend-$TARGET_STACK - name: Wait for stack initialization @@ -209,7 +213,7 @@ jobs: - name: Start Traefik run: | cd "$DEPLOY_PATH" - docker compose -f $COMPOSE_FILE -f $COMPOSE_BLUE_GREEN up -d mvp-traefik + docker compose -f $COMPOSE_FILE -f $COMPOSE_BLUE_GREEN -f $COMPOSE_PROD up -d mvp-traefik - name: Wait for Traefik run: | diff --git a/docker-compose.blue-green.yml b/docker-compose.blue-green.yml index 82a393c..4391fa9 100644 --- a/docker-compose.blue-green.yml +++ b/docker-compose.blue-green.yml @@ -92,7 +92,7 @@ services: interval: 5s timeout: 5s retries: 5 - start_period: 90s + start_period: 180s deploy: resources: limits: @@ -183,7 +183,7 @@ services: interval: 5s timeout: 5s retries: 5 - start_period: 90s + start_period: 180s deploy: resources: limits: