Merge branch 'main' of github.com:FOSSistant/FOSSistant_BE

Author: sokft

.github/workflows/gradle.yml

@@ -10,10 +10,6 @@ permissions:
   contents: read
 
 jobs:
-  # ─────────────────────────────────────────────
-  # 1) Build-and-Push-Image Job
-  #    - Gradle 빌드 → Docker 이미지 빌드 → Docker Hub Push
-  # ─────────────────────────────────────────────
   build-and-push-image:
     name: Build & Push Docker Image
     runs-on: ubuntu-latest
@@ -46,10 +42,6 @@ jobs:
       - name: Push Docker Image to Docker Hub
         run: docker push ${{ secrets.DOCKER_USERNAME }}/fossistant:latest
 
-  # ─────────────────────────────────────────────
-  # 2) Deploy-with-Compose Job
-  #    - “Build”가 끝나면 Azure VM에 SSH 접속 → Compose로 배포
-  # ─────────────────────────────────────────────
   deploy-with-compose:
     name: Deploy to Azure VM via Docker Compose
     runs-on: ubuntu-latest
@@ -72,17 +64,15 @@ jobs:
 
       - name: Generate .env for Docker Compose
         run: |
-          cat <<EOF > .env
-AZURE_DB_USERNAME=${{ secrets.AZURE_DB_USERNAME }}
-AZURE_DB_PASSWORD=${{ secrets.AZURE_DB_PASSWORD }}
-GEMINI_KEY=${{ secrets.GEMINI_KEY }}
-GITHUB_TOKEN=${{ secrets.HUB_TOKEN }}
-JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}
-JWT_ACCESS_TOKEN_TIME=${{ secrets.JWT_ACCESS_TOKEN_TIME }}
-JWT_REFRESH_TOKEN_TIME=${{ secrets.JWT_REFRESH_TOKEN_TIME }}
-GITHUB_CLIENT_ID=${{ secrets.CLIENT_ID }}
-GITHUB_CLIENT_SECRET=${{ secrets.CLIENT_SECRET }}
-EOF
+          echo "AZURE_DB_USERNAME=${{ secrets.AZURE_DB_USERNAME }}" >> .env
+          echo "AZURE_DB_PASSWORD=${{ secrets.AZURE_DB_PASSWORD }}" >> .env
+          echo "GEMINI_KEY=${{ secrets.GEMINI_KEY }}" >> .env
+          echo "GITHUB_TOKEN=${{ secrets.HUB_TOKEN }}" >> .env
+          echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env
+          echo "JWT_ACCESS_TOKEN_TIME=${{ secrets.JWT_ACCESS_TOKEN_TIME }}" >> .env
+          echo "JWT_REFRESH_TOKEN_TIME=${{ secrets.JWT_REFRESH_TOKEN_TIME }}" >> .env
+          echo "GITHUB_CLIENT_ID=${{ secrets.CLIENT_ID }}" >> .env
+          echo "GITHUB_CLIENT_SECRET=${{ secrets.CLIENT_SECRET }}" >> .env
 
       - name: Upload docker-compose.yml to Azure VM
         run: |
@@ -105,33 +95,26 @@ EOF
           port: 22
           script: |
             set -eux
-
             cd /home/ubuntu/fossistant
 
-            # 1) 호스트에 시스템 Redis가 있다면 중지 (서비스 이름이 다를 수 있으니 상황에 맞게 수정)
-            echo "🛑 Stopping host's Redis service if running..."
+            echo "🛑 Stopping Redis if running..."
             sudo systemctl stop redis-server || true
 
-            # 2) 호스트 포트 6379를 점유한 모든 프로세스 강제 종료
-            echo "🧼 Killing any process listening on port 6379..."
+            echo "🧼 Killing anything on port 6379..."
             sudo fuser -k 6379/tcp || true
 
-            # 3) 기존 컨테이너 강제 제거
-            echo "🧼 Forcibly removing any existing containers named 'redis' or 'fossistant'..."
+            echo "🧼 Removing old containers..."
             docker rm -f redis fossistant || true
 
-            # 4) Compose로 띄웠던 컨테이너·네트워크 정리
-            echo "🧹 Stopping old containers and removing orphans..."
+            echo "🧹 Stopping and cleaning old compose stack..."
             sudo docker compose down --remove-orphans || true
             sudo docker compose rm -f || true
 
-            # 5) 최신 이미지 Pull
-            echo "✅ Pulling latest images from Docker Hub..."
+            echo "✅ Pulling new image..."
             sudo docker compose pull
 
-            # 6) 새 컨테이너 기동
-            echo "🚀 Starting new containers with Docker Compose..."
+            echo "🚀 Deploying with Compose..."
             sudo docker compose up -d --build
 
-            echo "🎉 Deployment complete! Current containers:"
+            echo "🎉 Deployment complete!"
             docker ps