Update build-and-deploy.yml

Author: Danto7632

.github/workflows/build-and-deploy.yml

@@ -1,4 +1,4 @@
-name: Build & Deploy Spike (Flask-only → GHCR → EC2)
+name: Build & Deploy Spike (GHCR → EC2)
 
 on:
   push:
@@ -13,18 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & Push spike image (root Dockerfile)
+      - name: Build & Push spike image
         uses: docker/build-push-action@v6
         with:
-          context: .           # 루트 컨텍스트
-          file: ./Dockerfile   # 루트 Dockerfile 사용
+          context: .
+          file: ./Dockerfile
           push: true
           tags: |
             ghcr.io/dmu-debugvisual/debugvisual-spike:latest
@@ -40,8 +41,17 @@ jobs:
           sed -i 's/\r$//' ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan -H "$HOST" >> ~/.ssh/known_hosts
-          ssh "$USER@$HOST" "\
-            docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} && \
-            cd ~/apps/debugvisual && \
-            docker compose pull && docker compose up -d && \
-            docker image prune -af || true"
+
+          ssh "$USER@$HOST" "bash -s" << 'EOSSH'
+          set -e
+          LOCK=/tmp/debugvisual.deploy.lock
+          (
+            flock -n 9 || { echo 'Another deploy is running. Skip.'; exit 0; }
+            cd ~/apps/debugvisual
+            docker logout ghcr.io || true   # 익명 pull 강제
+            docker compose pull --ignore-pull-failures flask-server
+            docker compose up -d --wait --remove-orphans flask-server
+            docker image prune -af || true
+            curl -skI https://api.zivorp.com/healthz | head -n1
+          ) 9>$LOCK
+          EOSSH