Update deploy.yml

Author: Danto7632

.github/workflows/deploy.yml

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
+      # (Spring) 빌드
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
@@ -25,13 +27,15 @@ jobs:
           key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*','**/gradle-wrapper.properties') }}
       - run: ./gradlew clean bootJar --no-daemon
 
+      # GHCR 로그인(액션에서만 필요)
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      # 이미지 푸시 (latest + sha)
       - uses: docker/build-push-action@v6
         with:
           context: .
@@ -40,6 +44,7 @@ jobs:
             ghcr.io/dmu-debugvisual/debugvisual-backend:latest
             ghcr.io/dmu-debugvisual/debugvisual-backend:${{ github.sha }}
 
+      # EC2 배포 (익명 pull)
       - name: Deploy on EC2 (compose pull/up)
         env:
           HOST: ${{ secrets.EC2_HOST }}
@@ -50,8 +55,18 @@ 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 backend
+            docker compose up -d --wait --remove-orphans backend
+            docker image prune -af || true
+            curl -skI https://api.zivorp.com/healthz | head -n1
+          ) 9>$LOCK
+          EOSSH