Merge remote-tracking branch 'origin/main'

Author: TaetaetaE01

.github/workflows/ci-cd.yml

@@ -1,4 +1,4 @@
-name: CI/CD - Build, Push and Deploy
+name: CI/CD - 도커 컴포즈를 이용한 빌드, 푸시, 배포
 
 on:
   push:
@@ -11,32 +11,31 @@ concurrency:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    
+
     env:
       AWS_REGION: ap-northeast-2
       ECR_REGISTRY: 118497224929.dkr.ecr.ap-northeast-2.amazonaws.com
       ECR_REPOSITORY: clip-trip/server
       IMAGE_TAG: latest
 
     steps:
-      - name: Checkout source
+      - name: 소스코드 체크아웃
         uses: actions/checkout@v4
 
-      - name: Set up Java
+      - name: 자바 환경 설정
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
 
-      - name: make application-prod.yml
+      - name: application.yml 파일 생성
         run: |
           mkdir -p ./src/main/resources
           cd ./src/main/resources
-          touch ./application-dev.yml
           echo "${{ secrets.APPLICATION_PROD }}" > ./application.yml
         shell: bash
 
-      - name: Gradle Caching
+      - name: Gradle 캐싱
         uses: actions/cache@v4
         with:
           path: |
@@ -45,23 +44,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Build Spring Boot App
+      - name: 스프링 부트 앱 빌드
         run: ./gradlew clean bootJar -x test
 
-      - name: Copy jar for Docker
-        run: cp build/libs/*.jar app.jar
-
-      - name: Configure AWS Credentials
+      - name: AWS 자격 증명 설정
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ${{ env.AWS_REGION }}
 
-      - name: Log in to Amazon ECR
+      - name: Amazon ECR 로그인
         uses: aws-actions/amazon-ecr-login@v2
 
-      - name: Build and Push Docker Image
+      - name: 도커 이미지 빌드 및 푸시
         run: |
           IMAGE_URI=$(aws sts get-caller-identity --query "Account" --output text).dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
           docker build -t $IMAGE_URI .
@@ -72,36 +68,27 @@ jobs:
     needs: [ build-and-push ]
 
     steps:
-      - name: Deploy to EC2 via SSH
+      - name: 소스코드 체크아웃
+        uses: actions/checkout@v4
+
+      - name: SSH를 통해 EC2에 배포
         uses: appleboy/ssh-action@v0.1.7
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ec2-user
           key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
           script: |
             set -eux
-            
-            # EC2 서버 내부에서 환경 변수 직접 정의
-            AWS_REGION="ap-northeast-2"
-            ECR_REGISTRY="118497224929.dkr.ecr.ap-northeast-2.amazonaws.com"
-            ECR_REPOSITORY="clip-trip/server"
-            IMAGE_TAG="latest"
-
-            CONTAINER_NAME=clip-trip-server
-            IMAGE_URI=${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG}
 
-            echo "AWS_REGION: ${AWS_REGION}"
-            echo "ECR_REGISTRY: ${ECR_REGISTRY}"
-            echo "IMAGE_URI: ${IMAGE_URI}"
+            # ECR 환경 변수 설정
+            export AWS_REGION="ap-northeast-2"
+            export ECR_REGISTRY="118497224929.dkr.ecr.ap-northeast-2.amazonaws.com"
+            export ECR_REPOSITORY="clip-trip/server"
+            export IMAGE_TAG="latest"
 
-            # ECR 로그인 및 최신 이미지 풀
+            # ECR 로그인
             aws ecr get-login-password --region ${AWS_REGION} | docker login --username AWS --password-stdin ${ECR_REGISTRY}
-            docker pull ${IMAGE_URI}
-
-            # 기존 컨테이너 중지 및 삭제 (오류 무시)
-            docker stop "$CONTAINER_NAME" || true
-            docker rm "$CONTAINER_NAME" || true
 
-            # 새로운 컨테이너 실행
-            echo "Running new container $CONTAINER_NAME"
-            docker run -d --name "$CONTAINER_NAME" -p 8080:8080 ${IMAGE_URI}
+            # 도커 컴포즈로 배포
+            # 'up' 명령어가 docker-compose.yml 파일을 현재 디렉토리에서 찾음.
+            docker-compose up -d --force-recreate

Dockerfile

@@ -1,3 +1,13 @@
+FROM openjdk:21-jdk-slim AS builder
+
+WORKDIR /app
+
+COPY build/libs/*.jar app.jar
+
 FROM openjdk:21-jdk-slim
-COPY app.jar app.jar
+
+WORKDIR /app
+
+COPY --from=builder /app/app.jar .
+
 ENTRYPOINT ["java", "-jar", "app.jar"]

docker-compose-local.yml

@@ -0,0 +1,25 @@
+version: '3.8'
+
+services:
+  redis:
+    image: redis:7.2.5
+    container_name: redis
+    restart: always
+    volumes:
+      - redis_data:/data
+
+  app:
+    build: .
+    image: 118497224929.dkr.ecr.ap-northeast-2.amazonaws.com/clip-trip/server:latest
+    container_name: clip-trip-server
+    ports:
+      - "8080:8080"
+    depends_on:
+      - redis
+    environment:
+      - SPRING_DATA_REDIS_HOST=redis
+      - SPRING_DATA_REDIS_PORT=6379
+    restart: always
+
+volumes:
+  redis_data: