depromeet
diff --git a/‎.github/workflows/develop-build-deploy.yml
+73-43 b/‎.github/workflows/develop-build-deploy.yml
+73-43
diff --git a/‎.github/workflows/develop-pull-request-on-check.yml
+5-1 b/‎.github/workflows/develop-pull-request-on-check.yml
+5-1
diff --git a/‎.github/workflows/production-build-deploy.yml
+73-53 b/‎.github/workflows/production-build-deploy.yml
+73-53
diff --git a/‎Dockerfile
+1-1 b/‎Dockerfile
+1-1
diff --git a/‎build.gradle
+5 b/‎build.gradle
+5
diff --git a/‎docker-compose-test.yaml
+9 b/‎docker-compose-test.yaml
+9
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         java-version: [ 17 ]
-        distribution: [ 'zulu' ]
+        distribution: [ 'temurin' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -26,6 +26,10 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: ${{ matrix.distribution }}
 
+      # test 활용 목적의 container 실행
+      - name: Start test docker container
+        run: docker compose -f ./docker-compose-test.yaml up -d
+
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
 
@@ -38,53 +42,79 @@ jobs:
             --scan
           cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
 
-      # Docker 이미지 빌드 및 도커 허브 푸시
-      - name: Docker build & push
-        run: |
-          docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }} .
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}
+      # Dockerhub 로그인
+      - name: Login to Dockerhub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Docker 메타데이터 추출
+      - name: Extract Docker metadata
+        id: metadata
+        uses: docker/[email protected]
+        env:
+          DOCKERHUB_IMAGE_FULL_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}
+        with:
+          images: ${{ env.DOCKERHUB_IMAGE_FULL_NAME }}
+          tags: |
+            type=sha,prefix=
 
-      - name: Current Time
-        uses: gerred/[email protected]
-        id: current-time
+      # Docker 이미지 빌드 및 도커허브로 푸시
+      - name: Docker Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.metadata.outputs.tags }}
 
-      - name: Replace string
-        uses: frabert/[email protected]
-        id: format-time
+      # 서버로 docker-compose 파일 전송
+      - name: Copy docker-compose file to EC2
+        uses: burnett01/[email protected]
         with:
-          pattern: '[:\.]+'
-          string: "${{ steps.current-time.outputs.time }}"
-          replace-with: '-'
-          flags: 'g'
+          switches: -avzr --delete
+          remote_host: ${{ secrets.EC2_HOST }}
+          remote_user: ${{ secrets.EC2_USERNAME }}
+          remote_key: ${{ secrets.EC2_PRIVATE_KEY }}
+          path: docker-compose.yaml
+          remote_path: /home/ec2-user/
 
-      - name: Prepare deployment package
-        run: |
-          zip -r deployment-package.zip docker-compose.yaml nginx/default.conf
+      - name: Copy default.conf to EC2
+        uses: burnett01/[email protected]
+        with:
+          switches: -avzr --delete
+          remote_host: ${{ secrets.EC2_HOST }}
+          remote_user: ${{ secrets.EC2_USERNAME }}
+          remote_key: ${{ secrets.EC2_PRIVATE_KEY }}
+          path: ./nginx
+          remote_path: /home/ec2-user/
 
-      - name: Beanstalk Deploy
-        uses: einaregilsson/beanstalk-deploy@v22
+      # EC2로 배포
+      - name: Deploy to EC2 Server
+        uses: appleboy/[email protected]
+        env:
+          IMAGE_FULL_URL: ${{ steps.metadata.outputs.tags }}
+          DOCKERHUB_IMAGE_NAME: ${{ env.DOCKERHUB_IMAGE_NAME }}
         with:
-          aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          existing_bucket_name: "walwal-server-dev-deployment"
-          application_name: "walwal-dev"
-          environment_name: "Walwal-dev-env"
-          version_label: "walwal-dev-${{ steps.format-time.outputs.replaced }}"
-          region: ap-northeast-2
-          deployment_package: deployment-package.zip
-          wait_for_environment_recovery: 180
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: IMAGE_FULL_URL, DOCKERHUB_IMAGE_NAME # docker-compose.yml 에서 사용할 환경 변수
+          debug: true
+          script: |
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+            docker compose up -d
+            docker exec -d nginx nginx -s reload
+            docker image prune -a -f
 
-      # Slack 알림
-      - name: Send Deploy Result to Slack
-        uses: rtCamp/action-slack-notify@v2
+      ## Slack
+      - name: Slack Alarm
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          author_name: GitHub-Actions CI/CD
+          fields: repo,message,commit,author,ref,job,took
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_USERNAME: 왈왈봇
-          SLACK_COLOR: ${{ job.status == 'success' && 'good' || 'danger' }}
-          SLACK_TITLE: "Deploy Summary - Develop"
-          SLACK_MESSAGE: |
-            - image tag: `${{ steps.metadata.outputs.tags }}`
-            - build scan report: ${{ steps.gradle.outputs.build-scan-url }}
-            - deploy status: ${{ job.status }}
-            - deploy time: ${{ steps.current-time.outputs.time }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required
+        if: always() # Pick up events even if the job fails or is canceled.
+
@@ -17,7 +17,11 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: 'zulu'
+          distribution: 'adopt'
+
+      # test 활용 목적의 container 실행
+      - name: Start test docker container
+        run: docker compose -f ./docker-compose-test.yaml up -d
 
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
 
@@ -5,9 +5,12 @@ on:
     tags:
       - v*.*.*
 
+permissions:
+  id-token: write
+  contents: read
+
 env:
   DOCKERHUB_IMAGE_NAME: walwal-server
-  DOCKERHUB_IMAGE_FULL_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/walwal-server
 
 jobs:
   build-deploy:
@@ -17,15 +20,19 @@ jobs:
       matrix:
         java-version: [ 17 ]
         distribution: [ 'temurin' ]
-
     steps:
-      # 기본 체크아웃
+      # 체크아웃
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      # JDK를 17 버전으로 세팅
+      # Docker 이미지 태그 세팅
+      - name: Set up image-tag by GITHUB_SHA
+        id: image-tag
+        run: echo "value=$(cut -d'v' -f2 <<< ${GITHUB_REF#refs/*/})" >> $GITHUB_OUTPUT
+
+      # JDK 17 버전으로 세팅
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java-version }}
           distribution: ${{ matrix.distribution }}
@@ -34,15 +41,24 @@ jobs:
       - name: Run chmod to make gradlew executable
         run: chmod +x ./gradlew
 
+      # Redis 컨테이너 실행
+      - name: Start containers
+        run: docker-compose -f ./docker-compose-test.yaml up -d
+
       # Gradle 빌드
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }} # feature 브랜치는 캐시를 읽기 전용으로 설정
+          cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
+          add-job-summary-as-pr-comment: always
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
+          build-scan-terms-of-use-agree: "yes"
+
       - name: Build with Gradle
         id: gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: |
-            build
-            --scan
-          cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
+        run: ./gradlew build --configuration-cache
 
       # Dockerhub 로그인
       - name: Login to Dockerhub
@@ -55,6 +71,8 @@ jobs:
       - name: Extract Docker metadata
         id: metadata
         uses: docker/[email protected]
+        env:
+          DOCKERHUB_IMAGE_FULL_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }}
         with:
           images: ${{ env.DOCKERHUB_IMAGE_FULL_NAME }}
           tags: |
@@ -70,55 +88,57 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      # Docker 이미지 빌드 및 도커허브로 푸시
+      # 이미지 빌드 및 Dockerhub에 푸시
       - name: Docker Build and Push
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/arm64/v8
+          platforms: linux/arm64
           push: true
-          tags: ${{ steps.metadata.outputs.tags }}
-
-      - name: Current Time
-        uses: gerred/[email protected]
-        id: current-time
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/walwal-server:${{ steps.image-tag.outputs.value }}
 
-      - name: Replace string
-        uses: frabert/[email protected]
-        id: format-time
+      # AWS 로그인
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
         with:
-          pattern: '[:\.]+'
-          string: "${{ steps.current-time.outputs.time }}"
-          replace-with: '-'
-          flags: 'g'
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ap-northeast-2
+          output-config: true
+
+      # 복사 경로 환경변수 설정
+      - name: Set up S3 copy path
+        env:
+          S3_DEPLOY_BUCKET_NAME: ${{ secrets.S3_DEPLOY_BUCKET_NAME }}
+        run: echo "S3_COPY_PATH=$(echo s3://${S3_DEPLOY_BUCKET_NAME}/walwal-prod/docker-compose.yaml)" >> $GITHUB_ENV
 
-      - name: Prepare deployment package
-        run: |
-          zip -r deployment-package.zip docker-compose.yaml nginx/default.conf
+      # S3로 docker-compose 파일 전송
+      - name: Copy docker-compose file to S3
+        run: aws s3 cp docker-compose.yaml ${{ env.S3_COPY_PATH }}
 
-      - name: Beanstalk Deploy
-        uses: einaregilsson/beanstalk-deploy@v22
+      - name: Deploy to EC2 Server
+        uses: appleboy/ssh-action@master
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          IMAGE_FULL_URL: ${{ steps.metadata.outputs.tags }}
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: IMAGE_FULL_URL # docker-compose.yaml 에서 사용할 환경 변수
+          script: |
+            aws s3 cp ${{ env.S3_COPY_PATH }} docker-compose.yaml
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+            docker pull ${{ env.IMAGE_FULL_URL }}
+            docker compose up -d
+            docker image prune -a -f
+
+      ## Slack
+      - name: Slack Alarm
+        uses: 8398a7/action-slack@v3
         with:
-          aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          existing_bucket_name: "walwal-server-prod-deployment"
-          application_name: "walwal-prod"
-          environment_name: "Walwal-prod-env"
-          version_label: "walwal-prod-${{ steps.format-time.outputs.replaced }}"
-          region: ap-northeast-2
-          deployment_package: deployment-package.zip
-          wait_for_environment_recovery: 180
-
-      # Slack 알림
-      - name: Send Deploy Result to Slack
-        uses: rtCamp/action-slack-notify@v2
+          status: ${{ job.status }}
+          author_name: GitHub-Actions CI/CD
+          fields: repo,message,commit,author,ref,job,took
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_USERNAME: 왈왈봇
-          SLACK_COLOR: ${{ job.status == 'success' && 'good' || 'danger' }}
-          SLACK_TITLE: "Deploy Summary - Production"
-          SLACK_MESSAGE: |
-            - image tag: `${{ steps.metadata.outputs.tags }}`
-            - build scan report: ${{ steps.gradle.outputs.build-scan-url }}
-            - deploy status: ${{ job.status }}
-            - deploy time: ${{ steps.current-time.outputs.time }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required
+        if: always() # Pick up events even if the job fails or is canceled.
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:17-latest
+FROM eclipse-temurin:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]
@@ -28,6 +28,7 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 
     // Actuator
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
@@ -77,6 +78,10 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
     // FixtureMonkey
     testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:1.0.20")
+
+    // FCM
+    implementation 'com.google.firebase:firebase-admin:9.3.0'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.16.1'
 }
 
 tasks.named('test') {
 
@@ -0,0 +1,9 @@
+version: "3.8"
+
+services:
+  redis:
+    image: "redis:alpine"
+    ports:
+      - "6379:6379"
+    environment:
+      - TZ=Asia/Seoul