chore_resolve_git_conflict

.gitea/workflows/deploy.yml

@@ -13,17 +13,15 @@ jobs:
     steps:
       - name: Deploy Task on Host
         run: |
-          echo "Starting Standard CI/CD Deploy pipeline..."
-          docker run --rm \
-            -v /home/ubuntu/app/ax_hub_mcp_tool:/app \
-            -v /var/run/docker.sock:/var/run/docker.sock \
-            -v /home/ubuntu/.gradle:/root/.gradle \
-            -w /app \
-            eclipse-temurin:21-jdk-jammy \
-            /bin/bash -c "git pull && chmod +x gradlew && ./gradlew bootJar -x test"
+          echo Starting Ultra-Fast Docker-Socket CI/CD Pipeline...
           
-          cd /home/ubuntu/app/ax_hub_mcp_tool
-          find . -name "*-plain.jar" -delete
-          docker compose down
-          docker compose up -d --build gateway redis mci-mock dozzle tool-sms tool-email tool-other tool-payment gitea-runner
-          echo "CI/CD Deploy Success!"
+          # 1. eclipse-temurin 이미지 구동 후 git 설치 및 pull & build 기동
+          docker run --rm             -v /home/ubuntu/app/ax_hub_mcp_tool:/app             -v /var/run/docker.sock:/var/run/docker.sock             -v /home/ubuntu/.gradle:/root/.gradle             -w /app             eclipse-temurin:21-jdk-jammy             /bin/bash -c apt-get update -qq && apt-get install -y -qq git && git pull && chmod +x gradlew && ./gradlew bootJar -x test
+          
+          # 2. 빌드 결과 아카이빙 정리
+          docker run --rm             -v /home/ubuntu/app/ax_hub_mcp_tool:/app             -w /app             alpine             /bin/sh -c find . -name  \*-plain.jar\' -delete
+          
+          # 3. 호스트 도커 컴포즈 재부팅 제어
+          docker run --rm             -v /home/ubuntu/app/ax_hub_mcp_tool:/app             -v /var/run/docker.sock:/var/run/docker.sock             -w /app             docker:cli             /bin/sh -c docker compose down && docker compose up -d --build gateway redis mci-mock dozzle tool-sms tool-email tool-other tool-payment gitea-runner
+          
+          echo CI/CD Deploy Success!