Merge pull request #204 from PSR-Co/feat/#203-docker

[fix] CICD docker로 변경
PSR-Co · Dec 13, 2023 · c86d31e · c86d31e
2 parents 23630d3 + c56d7cd
commit c86d31e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 29 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,19 +1,12 @@
-name: deploy
+name: Docker-Push
 
 on:
   push:
     branches: [ "develop" ]
 
-env:
-  PROJECT_NAME: psr_project
-  BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }}
-  CODE_DEPLOY_APP_NAME: ${{ secrets.CODE_DEPLOY_APP_NAME}}
-  DEPLOYMENT_GROUP_NAME: ${{ secrets.DEPLOYMENT_GROUP_NAME}}
-  # AWS_REGION: ${{ secrets.AWS_REGION}}
-
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
 
@@ -48,26 +41,26 @@ jobs:
         run: chmod +x ./gradlew
         shell: bash
 
-      - name: Build and Test
+      - name: Build and no Test
         run: ./gradlew build -x test
 
-      - name: Make zip file
-        run: zip -qq -r ./$GITHUB_SHA.zip .
-        shell: bash
+      - name: Docker build & push to dev
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/psr-dev .
+          docker push ${{ secrets.DOCKER_USERNAME }}/psr-dev
 
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - name: Deploy to dev
+        uses: appleboy/ssh-action@master
+        id: deploy-dev
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_PRIVATE_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION}}
-
-      - name: Upload to S3
-        run: aws s3 cp --region ${{ secrets.AWS_REGION}} ./$GITHUB_SHA.zip s3://$BUCKET_NAME/$PROJECT_NAME/$GITHUB_SHA.zip
-
-      - name: Code Deploy To EC2 instance
-        run: aws deploy create-deployment 
-                --application-name $CODE_DEPLOY_APP_NAME 
-                --deployment-config-name CodeDeployDefault.AllAtOnce
-                --deployment-group-name $DEPLOYMENT_GROUP_NAME 
-                --s3-location bucket=$BUCKET_NAME,bundleType=zip,key=$PROJECT_NAME/$GITHUB_SHA.zip
+          host: ${{ secrets.HOST_DEV }} # EC2 퍼블릭 IPv4 DNS
+          username: ${{ secrets.USERNAME }} # ubuntu
+          port: 22
+          key: ${{ secrets.PRIVATE_KEY }}
+          script: |
+            sudo docker stop $(docker ps -a -q)
+            sudo docker rm $(docker ps -a -q)
+            sudo docker pull ${{ secrets.DOCKER_USERNAME }}/psr-dev
+            sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/psr-dev
+            sudo docker image prune -f
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -24,7 +24,7 @@ jwt:
   secret: ENC(D/J3tK1EsFjPnY9dcx50UUSzNzB5tTleAlexxN3r3wkA8sqpgJRMI2FLQ42o2ULv4yRTpdHetU+chCDq6VyHldYOLo7dW2J9gtM2kRERjRhDxczv4yBK2mpVrfp5/q5KdCGqitwAjP0qWi5vX4ho6VUIoMaMiCocHDZeBCn7nWs=)
 
 redis:
-  host: ENC(7JwhPcwbNCOmhXXFSWFKpp6kzUy0amcK)
+  host: ENC(8HcjYIVnkeDGkkPUQ3+cB8wLAwqDOdPd)
   port: ENC(abmpN3SWG3scsGG4F6VJbw==)
   password: ENC(xr9ZvfQtVGCxlbymLxNPXG4Qxyl40IA9)