diff --git a/.gitea/workflows/ci-deploy.yml b/.gitea/workflows/ci-deploy.yml index 87a0c45a..ce17fa96 100644 --- a/.gitea/workflows/ci-deploy.yml +++ b/.gitea/workflows/ci-deploy.yml @@ -70,10 +70,10 @@ jobs: if: github.ref == 'refs/heads/main' runs-on: self-hosted steps: - - name: ' Checkout' + - name: " Checkout" uses: actions/checkout@v4 - - name: '🚀 Deploy to QNAP' + - name: "🚀 Deploy to QNAP" run: | mkdir -p ~/.ssh echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa @@ -100,4 +100,4 @@ jobs: ./scripts/deploy.sh REMOTE_EOF - timeout-minutes: 30 + timeout-minutes: 20 diff --git a/scripts/deploy.sh b/scripts/deploy.sh index b710329d..872680e5 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -51,15 +51,7 @@ echo "✓ Images built" # [2/3] Start / restart stack with new images echo "[2/3] Starting application stack..." - -# Check if clamav is already healthy to avoid 5-minute healthcheck delay -if docker ps --filter "name=clamav" --filter "status=running" --format "{{.Status}}" 2>/dev/null | grep -q "healthy"; then - echo " ClamAV already healthy, skipping recreation" - docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d --force-recreate backend frontend -else - echo " ClamAV not healthy or not running, recreating full stack" - docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d --force-recreate -fi +docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d --force-recreate echo "✓ Stack started" # [3/3] Health check