develop -> main 작업내용 저장

.github/pull_request_template.md

@@ -8,7 +8,7 @@
 
 ---
 
-## 📸 스크린샷 (선택)
+## 📸 스크린샷
 API 응답 / Swagger / 에러 화면 등이 있다면 첨부해주세요.
 
 ---
@@ -24,3 +24,7 @@ API 응답 / Swagger / 에러 화면 등이 있다면 첨부해주세요.
 관련된 이슈가 있다면 연결해주세요.
 
 ---
+## ✅ 체크리스트 
+- [ ] 로컬에서 빌드 및 테스트 완료
+- [ ] 테스트 결과 사진 첨부 완료
+- [ ] 코드 리뷰 반영 완료  

.github/workflows/cicd-dev.yml

@@ -0,0 +1,131 @@
+name: CI/CD - Develop
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: application.yml 파일 설정
+        run: |
+          mkdir -p src/main/resources
+          cat << 'EOF' > ./src/main/resources/application.yml
+          ${{ secrets.APPLICATION_YML }}
+          EOF
+
+      - name: application-dev.yml 생성
+        run: |
+          cat << 'EOF' > src/main/resources/application-dev.yml
+          ${{ secrets.APPLICATION_DEV_YML }}
+          EOF
+
+      - name: Build with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew clean build -x test
+
+      - name: Docker Hub Login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build & Push Docker Image
+        run: |
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/loopit-dev:latest .
+          docker push ${{ secrets.DOCKER_USERNAME }}/loopit-dev:latest
+
+  cd:
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    needs: ci
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create .env file
+        run: |
+          echo "${{ secrets.ENV_TEST }}" > .env.test
+
+      # 1. EC2의 기존 꼬인 폴더 구조 정리
+      - name: Cleanup EC2 Directory
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            # 이전에 잘못 생성된 docker/docker 구조가 있다면 삭제
+            rm -rf /home/ubuntu/loopit-dev/docker/docker
+            mkdir -p /home/ubuntu/loopit-dev/docker
+
+      # 2. .env.test 전송
+      - name: Copy .env.test
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ".env.test"
+          target: "/home/ubuntu/loopit-dev/docker/"
+
+      # 3. docker-compose.dev.yml 전송 (strip_components: 상위 디렉토리 제거 1)
+      - name: Copy docker-compose
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: "docker/docker-compose.dev.yml"
+          target: "/home/ubuntu/loopit-dev/docker/"
+          strip_components: 1
+
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            cd /home/ubuntu/loopit-dev/docker/
+
+            # 1️⃣ 환경 변수 파일 확인.
+            if [ ! -f ".env.test" ]; then
+              echo "❌ 에러: .env.test 파일이 없습니다."
+              exit 1
+            fi
+
+            echo "📄 .env.test 내용 확인 (디버깅용):"
+            cat .env.test
+
+            # 사용하지 않는 모든 이미지, 컨테이너, 네트워크 삭제
+            docker system prune -af  
+
+            # 2️⃣ 기존 컨테이너 및 네트워크 정리 (prod에서는  -v --remove-orphans에서 -v 삭제)
+            docker compose -f docker-compose.dev.yml --env-file .env.test down -v --remove-orphans
+
+            # 3️⃣ 최신 이미지 풀링
+            docker compose -f docker-compose.dev.yml --env-file .env.test pull
+
+            # 4️⃣ 컨테이너 실행
+            if docker compose -f docker-compose.dev.yml --env-file .env.test up -d; then
+              echo "✅ 배포가 성공적으로 완료되었습니다!"
+              docker ps
+            else
+              echo "❌ 에러: 컨테이너 실행에 실패했습니다."
+              exit 1
+            fi

.github/workflows/cicd-prod.yml

@@ -0,0 +1,128 @@
+name: CI/CD - Product
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: application.yml 파일 설정
+        run: |
+          mkdir -p src/main/resources
+          cat << 'EOF' > ./src/main/resources/application.yml
+          ${{ secrets.APPLICATION_YML }}
+          EOF
+
+      - name: application-dev.yml 생성
+        run: |
+          cat << 'EOF' > src/main/resources/application-prod.yml
+          ${{ secrets.APPLICATION_PROD_YML }}
+          EOF
+
+      - name: Build with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew clean build -x test
+
+      - name: Docker Hub Login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build & Push Docker Image
+        run: |
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/loopit-prod:latest .
+          docker push ${{ secrets.DOCKER_USERNAME }}/loopit-prod:latest
+
+  cd:
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    needs: ci
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create .env file
+        run: |
+          echo "${{ secrets.ENV }}" > .env
+
+      # 1. EC2의 기존 꼬인 폴더 구조 정리
+      - name: Cleanup EC2 Directory
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.PROD_EC2_HOST }}
+          username: ${{ secrets.PROD_EC2_USER }}
+          key: ${{ secrets.PROD_EC2_SSH_KEY }}
+          script: |
+            # 이전에 잘못 생성된 docker/docker 구조가 있다면 삭제
+            rm -rf /home/ubuntu/loopit-prod/docker/docker
+            mkdir -p /home/ubuntu/loopit-prod/docker
+
+      # 2. .env 전송
+      - name: Copy .env
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.PROD_EC2_HOST }}
+          username: ${{ secrets.PROD_EC2_USER }}
+          key: ${{ secrets.PROD_EC2_SSH_KEY }}
+          source: ".env"
+          target: "/home/ubuntu/loopit-prod/docker/"
+
+      # 3. docker-compose.prod.yml 전송 (strip_components: 상위 디렉토리 제거 1)
+      - name: Copy docker-compose
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.PROD_EC2_HOST }}
+          username: ${{ secrets.PROD_EC2_USER }}
+          key: ${{ secrets.PROD_EC2_SSH_KEY }}
+          source: "docker/docker-compose.prod.yml"
+          target: "/home/ubuntu/loopit-prod/docker/"
+          strip_components: 1
+
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.PROD_EC2_HOST }}
+          username: ${{ secrets.PROD_EC2_USER }}
+          key: ${{ secrets.PROD_EC2_SSH_KEY }}
+          script: |
+            cd /home/ubuntu/loopit-prod/docker/
+
+            # 1️⃣ 환경 변수 파일 확인.
+            if [ ! -f ".env" ]; then
+              echo "❌ 에러: .env 파일이 없습니다."
+              exit 1
+            fi
+
+            # 사용하지 않는 모든 이미지, 컨테이너, 네트워크 삭제
+            docker system prune -af  
+
+            # 2️⃣ 기존 컨테이너 및 네트워크 정리 (prod에서는  -v --remove-orphans에서 -v 삭제)
+            docker compose -f docker-compose.prod.yml --env-file .env down --remove-orphans
+
+            # 3️⃣ 최신 이미지 풀링
+            docker compose -f docker-compose.prod.yml --env-file .env pull
+
+            # 4️⃣ 컨테이너 실행
+            if docker compose -f docker-compose.prod.yml --env-file .env up -d; then
+              echo "✅ 배포가 성공적으로 완료되었습니다!"
+              docker ps
+            else
+              echo "❌ 에러: 컨테이너 실행에 실패했습니다."
+              exit 1
+            fi

.gitignore

@@ -7,11 +7,16 @@
 # BlueJ files
 *.ctxt
 
+# Spring Boot config
+src/main/resources/application.yml
+src/main/resources/application-*.yml
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
 *.jar
+!gradle/wrapper/gradle-wrapper.jar
 *.war
 *.nar
 *.ear
@@ -26,6 +31,18 @@ docker-compose.override.yml
 
 application.yml
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+# virtual machine crash logs
 hs_err_pid*
 replay_pid*
+
+# Gradle
+.gradle/
+build/
+
+# IntelliJ IDEA 
+.idea/
+*.iml
+
+# OS files 
+.DS_Store
+Thumbs.db