self-runner
diff --git a/‎.github/workflows/dev-CD.yml
Lines changed: 30 additions & 102 deletions b/‎.github/workflows/dev-CD.yml
Lines changed: 30 additions & 102 deletions
diff --git a/‎.github/workflows/release-CD.yml
Lines changed: 39 additions & 115 deletions b/‎.github/workflows/release-CD.yml
Lines changed: 39 additions & 115 deletions
@@ -1,9 +1,13 @@
-name: DEV Dockerhub Push
+name: Push Image to Amazon ECR
 
 on:
   push:
     branches:
       - dev
+env:
+  AWS_REGION: ap-northeast-2
+  ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+  GITHUB_SHA_FIX: ${{ github.sha }}
 
 jobs:
   build:
@@ -40,117 +44,41 @@ jobs:
         run: |
           cd ./src/main/resources
           touch ./application-secret.yml
-          echo "${{ secrets.APPLICATION_SECRET}}" > ./application-secret.yml
+          echo "${{ secrets.APPLICATION_SECRET }}" > ./application-secret.yml
         shell: bash
 
       # dev.yml 반영
       - name: Make application-dev.yml
         run: |
-         cd ./src/main/resources
-         echo "${{ secrets.APPLICATION_DEV}}" > ./application-dev.yml
+          cd ./src/main/resources
+          echo "${{ secrets.APPLICATION_DEV }}" > ./application-release.yml
         shell: bash
 
       # Gradle BootJar
       - name: BootJar with Gradle
         run: ./gradlew clean bootJar -Dspring.profiles.active=dev
 
-      # Docker Image Push
-      - name: Docker Image push
-        run: |
-          docker login -u ${{ secrets.DEV_DOCKERHUB_USERNAME }} -p ${{ secrets.DEV_DOCKERHUB_PASSWORD }}
-          docker build -t ${{ secrets.DEV_DOCKERHUB_USERNAME}}/${{ secrets.DEV_DOCKERHUB_REPOSITORY}} ./
-          docker push ${{ secrets.DEV_DOCKERHUB_USERNAME }}/${{ secrets.DEV_DOCKERHUB_REPOSITORY}}
-
-#name: Beanstalk Deploy
-#
-#on:
-#  push:
-#    branches:
-#      - dev
-#
-#jobs:
-#  build:
-#    # ubuntu 버전 지정
-#    runs-on: ubuntu-22.04
-#    steps:
-#      # Checkout 진행
-#      - uses: actions/checkout@v3
-#
-#      # JDK 11 설치
-#      - name: Set up JDK 11
-#        uses: actions/setup-java@v3
+      # Configure AWS Credentials by using IAM inform
+#      - name: Configure AWS credentials
+#        uses: aws-actions/configure-aws-credentials@v1
 #        with:
-#          java-version: '11'
-#          distribution: 'temurin'
-#
-#      # Gradle 캐싱
-#      - name: Gradle Caching
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            ~/.gradle/caches
-#            ~/.gradle/wrapper
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-#          restore-keys: |
-#            ${{ runner.os }}-gradle-
-#
-#      # Gradle 권한 부여
-#      - name: Grant execute permission for gradlew
-#        run: chmod +x gradlew
-#
-#      # yml 반영
-#      - name: Make application-secret.yml
-#        run: |
-#          cd ./src/main/resources
-#          touch ./application-secret.yml
-#          echo "${{ secrets.APPLICATION_SECRET}}" > ./application-secret.yml
-#        shell: bash
-#
-##      - name: Make firebase json
-##        run: |
-##          mkdir -p ./src/main/resources/firebase
-##          echo "${{ secrets.FIREBASE_DEV_ADMIN}}" > ./src/main/resources/firebase/firebase-dev-admin.json
-##        shell: bash
-#
-##      # makeFiles.config 반영
-##      - name: Make 00-makeFiles.config
-##        run: |
-##          cd ./.ebextensions
-##          touch ./00-makeFiles.config
-##          echo "${{ secrets.DEV_MAKEFILES}}" > ./00-makeFiles.config
-##        shell: bash
-#
-#      # Gradle BootJar
-#      - name: BootJar with Gradle
-#        run: ./gradlew clean bootJar
-#
-#      # 현재 시간 반영
-#      - name: Get current time
-#        uses: 1466587594/get-current-time@v2
-#        id: current-time
-#        with:
-#          format: YYYY-MM-DDTHH-mm-ss
-#          utcOffset: "+09:00"
-#
-#      # grandle build를 통해 만들어진 jar를 beanstalk에 배포하기 위한 zip 파일로 만드는 것
-#      - name: Generate deployment package
+#          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}          # 나의 ECR 정보
+#          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+#          aws-region: ${{ env.AWS_REGION }}
+
+      # Login to ECR
+#      - name: Login to Amazon ECR
+#        id: login-ecr
+#        uses: aws-actions/amazon-ecr-login@v1
+
+      # Docker Image Push to ECR and Run container with Image pull from ECR
+#      - name: Build, tag, and push image to Amazon ECR
+#        id: build-image
+#        env:
+#          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+#          IMAGE_TAG: ${{ env.GITHUB_SHA_FIX }}
 #        run: |
-#          mkdir -p deploy
-#          cp build/libs/*.jar deploy/application.jar
-#          cp Procfile deploy/Procfile
-#          cp -r .ebextensions deploy/.ebextensions
-#          cp -r .platform deploy/.platform
-#          cd deploy && zip -r deploy.zip .
-#
-#        # Beanstalk Deploy 플러그인 사용
-#      - name: Beanstalk Deploy
-#        uses: einaregilsson/beanstalk-deploy@v14
-#        with:
-#          aws_access_key: ${{ secrets.AWS_ACCESS_KEY }} # github secrets로 등록한 값 사용
-#          aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # github secrets로 등록한 값 사용
-#          application_name: Gwalit-dev # EB application 이름
-#          environment_name: Gwalit-dev-env # EB environment 이름
-#          version_label: Github Action-${{steps.current-time.outputs.formattedTime}} # 배포 버전은 타임스탬프를 이용하여 구분
-#          region: ap-northeast-2
-#          deployment_package: deploy/deploy.zip
-#          wait_for_environment_recovery: 100 # default wait time은 30초이며, 필자의 EB가 느려서 180초로 지정했습니다(지정 안하면 간혹 timeout 발생).
+#          # Build a docker container and push it to ECR so that it can be deployed to ECS.
+#          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+#          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+#          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
@@ -1,10 +1,15 @@
-name: Beanstalk Deploy
+name: Deploy release version
 
 on:
   push:
     branches:
       - release
 
+env:
+  AWS_REGION: ap-northeast-2
+  ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+  GITHUB_SHA: ${{ github.sha }}
+
 jobs:
   build:
     # ubuntu 버전 지정
@@ -40,137 +45,56 @@ jobs:
         run: |
           cd ./src/main/resources
           touch ./application-secret.yml
-          echo "${{ secrets.APPLICATION_SECRET}}" > ./application-secret.yml
+          echo "${{ secrets.APPLICATION_SECRET }}" > ./application-secret.yml
         shell: bash
 
       # release.yml 반영
       - name: Make application-release.yml
         run: |
           cd ./src/main/resources
-          echo "${{ secrets.GCP_APPLICATION_RELEASE}}" > ./application-release.yml
+          echo "${{ secrets.APPLICATION_RELEASE }}" > ./application-release.yml
         shell: bash
 
       # Gradle BootJar
       - name: BootJar with Gradle
         run: ./gradlew clean bootJar -Dspring.profiles.active=release
 
-      # Docker Image Push
-      - name: Docker Image push
+        # Configure AWS Credentials by using IAM inform
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}          # 나의 ECR 정보
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      # Login to ECR
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+      # Docker Image Push to ECR and Run container with Image pull from ECR
+      - name: Build, tag, and push image to Amazon ECR
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: ${{ env.GITHUB_SHA }}
         run: |
-          docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME}}/${{ secrets.DOCKERHUB_REPOSITORY}} ./
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY}}
+          # Build a docker container and push it to ECR so that it can be deployed to ECS.
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
 
       # Docker Compose
       - name: Docker Compose
-        uses: appleboy/ssh-action@master
+        uses: appleboy/ssh-action@v1.0.3
         with:
-          host: ${{ secrets.GCP_SERVER_IP }}
+          host: ${{ secrets.AWS_SERVER_IP }}
           username: ${{ secrets.SSH_USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
-          passphrase: ${{ secrets.SSH_PASSPHRASE }}
-          envs: GITHUB_SHA
           script: |
-            sudo docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
-            sudo docker-compose stop ${{ secrets.DOCKER_SERVICE_NAME }}
-            sudo docker-compose rm -f ${{ secrets.DOCKER_SERVICE_NAME }}
-            sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY}}
-            sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY}} ${{ secrets.DOCKER_IMAGE_NAME }}
-            sudo docker-compose up -d
-
-
-#name: Beanstalk Deploy
-#
-#on:
-#  push:
-#    branches:
-#      - release
-#
-#jobs:
-#  build:
-#    # ubuntu 버전 지정
-#    runs-on: ubuntu-22.04
-#    steps:
-#      # Checkout 진행
-#      - uses: actions/checkout@v3
-#
-#      # JDK 11 설치
-#      - name: Set up JDK 11
-#        uses: actions/setup-java@v3
-#        with:
-#          java-version: '11'
-#          distribution: 'temurin'
-#
-#      # Gradle 캐싱
-#      - name: Gradle Caching
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            ~/.gradle/caches
-#            ~/.gradle/wrapper
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-#          restore-keys: |
-#            ${{ runner.os }}-gradle-
-#
-#      # Gradle 권한 부여
-#      - name: Grant execute permission for gradlew
-#        run: chmod +x gradlew
-#
-#      # secret.yml 반영
-#      - name: Make application-secret.yml
-#        run: |
-#          cd ./src/main/resources
-#          touch ./application-secret.yml
-#          echo "${{ secrets.APPLICATION_SECRET}}" > ./application-secret.yml
-#        shell: bash
-#
-#      # release.yml 반영
-#      - name: Make application-release.yml
-#        run: |
-#          cd ./src/main/resources
-#          echo "${{ secrets.APPLICATION_RELEASE}}" > ./application-release.yml
-#        shell: bash
-#
-#
-##      # makeFiles.config 반영
-##      - name: Make 00-makeFiles.config
-##        run: |
-##          cd ./.ebextensions
-##          touch ./00-makeFiles.config
-##          echo "${{ secrets.RELEASE_MAKEFILES}}" > ./00-makeFiles.config
-##        shell: bash
-#
-#      # Gradle BootJar
-#      - name: BootJar with Gradle
-#        run: ./gradlew clean bootJar -Dspring.profiles.active=release
-#
-#      # 현재 시간 반영
-#      - name: Get current time
-#        uses: 1466587594/get-current-time@v2
-#        id: current-time
-#        with:
-#          format: YYYY-MM-DDTHH-mm-ss
-#          utcOffset: "+09:00"
-#
-#      # grandle build를 통해 만들어진 jar를 beanstalk에 배포하기 위한 zip 파일로 만드는 것
-#      - name: Generate deployment package
-#        run: |
-#          mkdir -p deploy
-#          cp build/libs/*.jar deploy/application.jar
-#          cp Procfile deploy/Procfile
-#          cp -r .ebextensions deploy/.ebextensions
-#          cp -r .platform deploy/.platform
-#          cd deploy && zip -r deploy.zip .
-#
-#        # Beanstalk Deploy 플러그인 사용
-#      - name: Beanstalk Deploy
-#        uses: einaregilsson/beanstalk-deploy@v14
-#        with:
-#          aws_access_key: ${{ secrets.AWS_ACCESS_KEY }} # github secrets로 등록한 값 사용
-#          aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # github secrets로 등록한 값 사용
-#          application_name: Gwalit-release # EB application 이름
-#          environment_name: Gwalit-release-env # EB environment 이름
-#          version_label: Github Action-${{steps.current-time.outputs.formattedTime}} # 배포 버전은 타임스탬프를 이용하여 구분
-#          region: ap-northeast-2
-#          deployment_package: deploy/deploy.zip
-#          wait_for_environment_recovery: 100 # default wait time은 30초이며, 필자의 EB가 느려서 180초로 지정했습니다(지정 안하면 간혹 timeout 발생).
+            aws ecr get-login-password --region ${{ env.AWS_REGION }} | docker login --username AWS --password-stdin ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}
+            docker-compose stop ${{ secrets.DOCKER_SERVICE_NAME }}
+            docker-compose rm -f ${{ secrets.DOCKER_SERVICE_NAME }}
+            docker pull ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.GITHUB_SHA_FIX }}
+            docker tag ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY }}:${{ env.GITHUB_SHA_FIX }} ${{ secrets.DOCKER_IMAGE_NAME }}
+            docker-compose up -d