diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index c1894d3..ac42a43 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -58,7 +58,9 @@ jobs: $SSH "$DEPLOY_USER@$DEPLOY_HOST" "mkdir -p \"\$(dirname '$DEPLOY_JAR_PATH')\" && cat > '$DEPLOY_JAR_PATH.new'" < "$JAR" $SSH "$DEPLOY_USER@$DEPLOY_HOST" "\ + docker compose -f '$COMPOSE_FILE' stop api 2>/dev/null || true; \ + rm -rf '$DEPLOY_JAR_PATH'; \ mv -f '$DEPLOY_JAR_PATH.new' '$DEPLOY_JAR_PATH'; \ docker compose -f '$COMPOSE_FILE' up -d --force-recreate api; \ - docker compose -f '$COMPOSE_FILE' ps api" + sleep 2; docker compose -f '$COMPOSE_FILE' ps api" echo "✅ 운영(api) 재기동 완료" \ No newline at end of file diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index f59d63b..d22a27c 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -63,8 +63,11 @@ jobs: # jar 전송: scp(SFTP) 경로 이슈 회피 위해 ssh stdin(cat) 사용. 임시파일 후 mv(원자적 교체). $SSH "$DEPLOY_USER@$DEPLOY_HOST" "mkdir -p \"\$(dirname '$DEPLOY_JAR_PATH')\" && cat > '$DEPLOY_JAR_PATH.new'" < "$JAR" + # 컨테이너 정지(마운트 해제) → 경로 정리(빈 디렉토리로 잘못 생성된 경우 포함) → jar 배치 → 재기동 $SSH "$DEPLOY_USER@$DEPLOY_HOST" "\ + docker compose -f '$COMPOSE_FILE' stop dev-api 2>/dev/null || true; \ + rm -rf '$DEPLOY_JAR_PATH'; \ mv -f '$DEPLOY_JAR_PATH.new' '$DEPLOY_JAR_PATH'; \ docker compose -f '$COMPOSE_FILE' up -d --force-recreate dev-api; \ - docker compose -f '$COMPOSE_FILE' ps dev-api" + sleep 2; docker compose -f '$COMPOSE_FILE' ps dev-api" echo "✅ dev-api 재기동 완료" \ No newline at end of file