feat(ci): merge remaining changes from 240-ai-console-collapsible-cards
- Reduce deploy timeout from 30 to 20 minutes - Remove ClamAV healthcheck logic from deploy.sh (force-recreate all containers)
This commit is contained in:
@@ -70,10 +70,10 @@ jobs:
|
|||||||
if: github.ref == 'refs/heads/main'
|
if: github.ref == 'refs/heads/main'
|
||||||
runs-on: self-hosted
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: ' Checkout'
|
- name: " Checkout"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: '🚀 Deploy to QNAP'
|
- name: "🚀 Deploy to QNAP"
|
||||||
run: |
|
run: |
|
||||||
mkdir -p ~/.ssh
|
mkdir -p ~/.ssh
|
||||||
echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa
|
echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa
|
||||||
@@ -100,4 +100,4 @@ jobs:
|
|||||||
|
|
||||||
./scripts/deploy.sh
|
./scripts/deploy.sh
|
||||||
REMOTE_EOF
|
REMOTE_EOF
|
||||||
timeout-minutes: 30
|
timeout-minutes: 20
|
||||||
|
|||||||
+1
-9
@@ -51,15 +51,7 @@ echo "✓ Images built"
|
|||||||
|
|
||||||
# [2/3] Start / restart stack with new images
|
# [2/3] Start / restart stack with new images
|
||||||
echo "[2/3] Starting application stack..."
|
echo "[2/3] Starting application stack..."
|
||||||
|
docker compose --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d --force-recreate
|
||||||
# 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
|
|
||||||
echo "✓ Stack started"
|
echo "✓ Stack started"
|
||||||
|
|
||||||
# [3/3] Health check
|
# [3/3] Health check
|
||||||
|
|||||||
Reference in New Issue
Block a user