Merge pull request #564 from sopt-makers/develop

* feat: coffee chat 최신순 정렬 추가 (#558) related issue #557 * [Feat] update dev server deploy script (#562) * feat: update dev server deploy script related issue #561 * fix: aws access key 수정 related issue #561 * fix: ecr login command related issue #561 * fix: remove 'amd64' tag related issue #561 * fix: remove 'amd64' tag related issue #561 * fix: ECR_REPO env를 사용하도록 수정 related issue #561 * fix: env 할당 방식 변경 related issue #561 * fix: env 할당 방식 변경 related issue #561 * fix: change platform related issue #561 * fix: ECR_REPO env 추가 related issue #561 * chore: ecr repo rollback * fix: ECR_HOST, ECR_REPO env 변경 * fix: ECR_HOST, ECR_REPO env 변경 * fix: cli만 사용하도록 변경 * fix: directory 명시 * fix: scp debugging - directory 수정 * fix: env 수정 * fix: docker -> docker-compose로 수정 * fix: docker -> docker-compose로 수정 - scp debug mode off related issue #561 * feat: port switching 추가 related issue #561 * fix: add health check sleep related issue #561 * refactor: script 공통 로직 function으로 최소화 related issue #561 * refactor: script 파일 분리 related issue #561 * fix: health check error related issue #561 * chore: test용 trigger 제거 related issue #561 * feat: apply to production workflow related issue #561 * chore: remove appspec.yml, code deploy script related issue #561 * chore: workflow name rollback related issue #561 * chore: region 'ap-northeast-2'로 변경 related issue #561 * chore: add end line related issue #561 * test: trigger 추가 related issue #561 * fix: ap-northeast-2 -> us-east-1 로 변경 related issue #561 * chore: remove trigger for test related issue #561
sopt-makers · Dec 15, 2024 · b41f217 · b41f217
2 parents e141b4e + 8529719
commit b41f217
Show file tree

Hide file tree

Showing 15 changed files with 298 additions and 104 deletions.
diff --git a/.github/workflows/cd-to-dev.yml b/.github/workflows/cd-to-dev.yml
@@ -17,6 +17,12 @@ on:
   push:
     branches: [ develop ]
 
+env:
+  SPRING_PROFILES_ACTIVE: dev
+  ECR_APP_NAME: ${{ secrets.ECR_APP_NAME }}-dev
+  ECR_REPO: ${{ secrets.ECR_HOST }}/${{ secrets.ECR_APP_NAME }}-dev
+  ECR_HOST: ${{ secrets.ECR_HOST }}
+
 jobs:
   build:
     name: CD Pipeline
@@ -35,12 +41,13 @@ jobs:
       - name: 'Check Java Version'
         run: |
           java --version
+          echo 'ecr repo is $ECR_REPO'
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - name: 'Configure AWS credentials'
+        uses: aws-actions/configure-aws-credentials@v2
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID__TEAM_PLAYGROUND }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY__TEAM_PLAYGROUND }}
           aws-region: ap-northeast-2
 
       - name: 'Get application.yml from AWS S3'
@@ -54,37 +61,58 @@ jobs:
           aws s3 cp \
             --region ap-northeast-2 \
             s3://sopt-makers-internal/dev/deploy/${{ secrets.APPLE_KEY }} src/main/resources/static/${{ secrets.APPLE_KEY }}
-        
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
-        shell: bash
 
-      - name: Build with Gradle
-        run: ./gradlew clean build -x test
+      - name: 'Build with Gradle'
+        run: |
+          chmod +x ./gradlew
+          ./gradlew clean build -x test
         shell: bash
 
-      - name: Get current time
+      - name: 'Login to ECR'
+        run: |
+          aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin $ECR_HOST
+
+      - name: 'Docker Image Build & Push'
+        run: |
+          docker build -t $ECR_APP_NAME .
+          docker tag $ECR_APP_NAME:latest $ECR_REPO
+          docker push $ECR_REPO
+
+      - name: 'Send docker-compose.yml to EC2 Instance'
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.DEV_RELEASE_SERVER_IP }}
+          username: ${{ secrets.RELEASE_SERVER_USER }}
+          key: ${{ secrets.DEV_RELEASE_SERVER_KEY }}
+          source: "./docker-compose.yml"
+          target: "/home/ec2-user/app/"
+
+      - name: 'Send deploy script to EC2 Instance'
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.DEV_RELEASE_SERVER_IP }}
+          username: ${{ secrets.RELEASE_SERVER_USER }}
+          key: ${{ secrets.DEV_RELEASE_SERVER_KEY }}
+          source: "./scripts/"
+          target: "/home/ec2-user/app/"
+
+      - name: 'Get current time'
         uses: 1466587594/get-current-time@v2
         id: current-time
         with:
           format: YYYY-MM-DDTHH-mm-ss
           utcOffset: "+09:00"
 
-      - name: Spring Boot env setting
-        run: sudo sed -i 's/-Dspring.profiles.active=dev/-Dspring.profiles.active=dev/g' ./aws/start.sh
-
-      - name: Check env profile
-        run: cat ./aws/start.sh
+      - name: 'Docker Container Run'
+        uses: appleboy/ssh-action@master
 
-      - name: Make zip file
-        run: zip -qq -r ./$GITHUB_SHA.zip .
-        shell: bash
-
-      - name: Upload to S3
-        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://sopt-makers-internal/dev/deploy/jar/$GITHUB_SHA.zip
-
-      - name: Code Deploy
-        run: aws deploy create-deployment --application-name internal
-          --deployment-config-name CodeDeployDefault.OneAtATime
-          --deployment-group-name dev
-          --s3-location bucket=sopt-makers-internal,bundleType=zip,key=dev/deploy/jar/$GITHUB_SHA.zip
+        with:
+          host: ${{ secrets.DEV_RELEASE_SERVER_IP }}
+          username: ${{ secrets.RELEASE_SERVER_USER }}
+          key: ${{ secrets.DEV_RELEASE_SERVER_KEY }}
+          script: | 
+            cd ~
+            sudo docker pull $ECR_REPO
+            sudo chmod +x ./app/scripts/*.sh
+            ./app/scripts/deploy.sh
+            docker image prune -f
diff --git a/.github/workflows/cd-to-prod.yml b/.github/workflows/cd-to-prod.yml
@@ -17,6 +17,12 @@ on:
   push:
     branches: [ main ]
 
+env:
+  SPRING_PROFILES_ACTIVE: prod
+  ECR_APP_NAME: ${{ secrets.ECR_APP_NAME }}-prod
+  ECR_REPO: ${{ secrets.ECR_HOST }}/${{ secrets.ECR_APP_NAME }}-prod
+  ECR_HOST: ${{ secrets.ECR_HOST }}
+
 jobs:
   build:
     name: CD Pipeline
@@ -36,11 +42,11 @@ jobs:
         run: |
           java --version
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - name: 'Configure AWS credentials'
+        uses: aws-actions/configure-aws-credentials@v2
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID__TEAM_PLAYGROUND }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY__TEAM_PLAYGROUND }}
           aws-region: ap-northeast-2
 
       - name: 'Get application.yml from AWS S3'
@@ -55,36 +61,57 @@ jobs:
             --region ap-northeast-2 \
             s3://sopt-makers-internal/prod/deploy/${{ secrets.APPLE_KEY }} src/main/resources/static/${{ secrets.APPLE_KEY }}
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
+      - name: 'Build with Gradle'
+        run: |
+          chmod +x ./gradlew
+          ./gradlew clean build -x test
         shell: bash
 
-      - name: Build with Gradle
-        run: ./gradlew clean build -x test
-        shell: bash
+      - name: 'Login to ECR'
+        run: |
+          aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin $ECR_HOST
+
+      - name: 'Docker Image Build & Push'
+        run: |
+          docker build -t $ECR_APP_NAME .
+          docker tag $ECR_APP_NAME:latest $ECR_REPO
+          docker push $ECR_REPO
+
+      - name: 'Send docker-compose.yml to EC2 Instance'
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.PROD_RELEASE_SERVER_IP }}
+          username: ${{ secrets.RELEASE_SERVER_USER }}
+          key: ${{ secrets.PROD_RELEASE_SERVER_KEY }}
+          source: "./docker-compose.yml"
+          target: "/home/ec2-user/app/"
+
+      - name: 'Send deploy script to EC2 Instance'
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.PROD_RELEASE_SERVER_IP }}
+          username: ${{ secrets.RELEASE_SERVER_USER }}
+          key: ${{ secrets.PROD_RELEASE_SERVER_KEY }}
+          source: "./scripts/"
+          target: "/home/ec2-user/app/"
 
-      - name: Get current time
+      - name: 'Get current time'
         uses: 1466587594/get-current-time@v2
         id: current-time
         with:
           format: YYYY-MM-DDTHH-mm-ss
           utcOffset: "+09:00"
 
-      - name: Spring Boot env setting
-        run: sudo sed -i 's/-Dspring.profiles.active=dev/-Dspring.profiles.active=prod/g' ./aws/start.sh
+      - name: 'Docker Container Run'
+        uses: appleboy/ssh-action@master
 
-      - name: Check env profile
-        run: cat ./aws/start.sh
-
-      - name: Make zip file
-        run: zip -qq -r ./$GITHUB_SHA.zip .
-        shell: bash
-
-      - name: Upload to S3
-        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://sopt-makers-internal/prod/deploy/jar/$GITHUB_SHA.zip
-
-      - name: Code Deploy
-        run: aws deploy create-deployment --application-name internal
-          --deployment-config-name CodeDeployDefault.OneAtATime
-          --deployment-group-name prod
-          --s3-location bucket=sopt-makers-internal,bundleType=zip,key=prod/deploy/jar/$GITHUB_SHA.zip
+        with:
+          host: ${{ secrets.PROD_RELEASE_SERVER_IP }}
+          username: ${{ secrets.RELEASE_SERVER_USER }}
+          key: ${{ secrets.PROD_RELEASE_SERVER_KEY }}
+          script: |
+            cd ~
+            sudo docker pull $ECR_REPO
+            sudo chmod +x ./app/scripts/*.sh
+            ./app/scripts/deploy.sh
+            docker image prune -f
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,11 +10,12 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Set up JDK 17'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'corretto'
           java-version: 17
 
       - name: 'Grant execute permission for gradlew'

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,7 @@
+FROM amazoncorretto:17
+WORKDIR /app
+COPY ./build/libs/internal-0.0.1-SNAPSHOT.jar /app/APPLICATION.jar
+
+ENV SPRING_PROFILES_ACTIVE=dev
+
+CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "APPLICATION.jar"]
diff --git a/appspec.yml b/appspec.yml
diff --git a/aws/start.sh b/aws/start.sh
diff --git a/aws/stop.sh b/aws/stop.sh
diff --git a/aws/valid.sh b/aws/valid.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '3.8'
+services:
+  playground-blue:
+    image: ${ECR_REPO}
+    expose:
+      - 8080
+    ports:
+      - "8080:8080"
+    environment:
+      - TZ=Asia/Seoul
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}
+
+  playground-green:
+    image: ${ECR_REPO}
+    expose:
+      - 8080
+    ports:
+      - "8081:8080"
+    environment:
+      - TZ=Asia/Seoul
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}