Update ci-cd.yml (#31)

Author: lejuho

.github/workflows/ci-cd.yml

@@ -203,30 +203,37 @@ jobs:
           username: ${{ secrets.EC2_USER }}
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
-            ECR_REGISTRY="${{ steps.login-ecr.outputs.registry }}"
-            ECR_REPOSITORY="cp_main_be"
-            # AWS CLI 설정 및 docker login
-            aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin $ECR_REGISTRY
-            # 이미지 pull
-            docker pull $ECR_REGISTRY/$ECR_REPOSITORY:latest
-            # 기존 컨테이너 정리
+            # AWS ECR 로그인
+            aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin ${{ steps.login-ecr.outputs.registry }}
+            
+            # 최신 이미지 pull
+            docker pull ${{ steps.login-ecr.outputs.registry }}/cp_main_be:latest
+            
+            # 기존 컨테이너 중지 및 삭제
             if [ $(docker ps -a -q -f name=spring-app-container) ]; then
               docker stop spring-app-container
               docker rm spring-app-container
             fi
-            # 환경변수 로드 및 새 컨테이너 실행
-            source /etc/environment
+            
+            # 1. GitHub Secret에서 Firebase 키 파일 생성
+            echo "${{ secrets.FIREBASE_KEY_JSON }}" > /home/${{ secrets.EC2_USER }}/serviceAccountKey.json
+            
+            # 2. 모든 환경 변수를 포함하여 새 컨테이너 실행
             docker run -d --name spring-app-container -p 8080:8080 \
-            -e DB_URL="$DB_URL" \
-            -e DB_USERNAME="$DB_USERNAME" \
-            -e DB_PASSWORD="$DB_PASSWORD" \
-            -e SPRING_PROFILES_ACTIVE=prod \
-            -e R2_ENDPOINT="${{ secrets.R2_ENDPOINT }}" \
-            -e R2_BUCKET="${{ secrets.R2_BUCKET }}" \
-            -e R2_ACCESS_KEY="${{ secrets.R2_ACCESS_KEY }}" \
-            -e R2_SECRET_KEY="${{ secrets.R2_SECRET_KEY }}" \
-            $ECR_REGISTRY/$ECR_REPOSITORY:latest
-
+              -e SPRING_PROFILES_ACTIVE=prod \
+              -e DB_URL="${{ secrets.DB_URL }}" \
+              -e DB_USERNAME="${{ secrets.DB_USERNAME }}" \
+              -e DB_PASSWORD="${{ secrets.DB_PASSWORD }}" \
+              -e R2_ENDPOINT="${{ secrets.R2_ENDPOINT }}" \
+              -e R2_BUCKET="${{ secrets.R2_BUCKET }}" \
+              -e R2_ACCESS_KEY="${{ secrets.R2_ACCESS_KEY }}" \
+              -e R2_SECRET_KEY="${{ secrets.R2_SECRET_KEY }}" \
+              -e JWT_SECRET="${{ secrets.JWT_SECRET }}" \
+              -e FASTAPI_URL="${{ secrets.FASTAPI_URL }}" \
+              -e API_TOKEN="${{ secrets.API_TOKEN }}" \
+              -e GOOGLE_APPLICATION_CREDENTIALS=/app/serviceAccountKey.json \
+              -v /home/${{ secrets.EC2_USER }}/serviceAccountKey.json:/app/serviceAccountKey.json \
+              ${{ steps.login-ecr.outputs.registry }}/cp_main_be:latest
   # 워크플로우 실행 결과 요약
   summary:
     runs-on: ubuntu-latest
@@ -246,4 +253,4 @@ jobs:
             echo "| EC2 배포 | ${{ needs.deploy.result == 'success' && '✅ 성공' || (needs.deploy.result == 'skipped' && '⏭️ 건너뜀' || '❌ 실패') }} |" >> $GITHUB_STEP_SUMMARY
           else
             echo "| 배포 관련 작업 | ⏭️ 건너뜀 (PR 이벤트) |" >> $GITHUB_STEP_SUMMARY
-          fi
+          fi