From 00425ab1e3e572cdc23515909f73f384a527e100 Mon Sep 17 00:00:00 2001 From: dooboocookie Date: Thu, 30 Nov 2023 01:27:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EC=84=9C=EB=B8=8C=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=EC=B5=9C=EC=8B=A0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/security | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/security b/backend/src/main/resources/security index 6aea9836a..5b2371b4a 160000 --- a/backend/src/main/resources/security +++ b/backend/src/main/resources/security @@ -1 +1 @@ -Subproject commit 6aea9836ab385f1eee8d5075f6dd98e800ff158e +Subproject commit 5b2371b4a27efb8d7238ce3acae775efb60278fb From 481a8f842c6c4abc2fe8172bf675ffd906b9d85a Mon Sep 17 00:00:00 2001 From: dooboocookie Date: Thu, 30 Nov 2023 01:29:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20ci/cd=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflows/backend_prod_merge_workflow.yml | 19 ++++++++++--------- .../java/com/now/naaga/NaagaApplication.java | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend_prod_merge_workflow.yml b/.github/workflows/backend_prod_merge_workflow.yml index 93cc2c7bb..391e4257c 100644 --- a/.github/workflows/backend_prod_merge_workflow.yml +++ b/.github/workflows/backend_prod_merge_workflow.yml @@ -44,17 +44,18 @@ jobs: - name: 🐳 도컀 이미지 λΉŒλ“œ 쀑... 🐳 run: | cd backend - docker build --platform linux/arm64/v8 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-prod . + docker build --platform linux/amd64 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-prod . - name: 🐳 도컀 ν—ˆλΈŒμ— Push 쀑... 🐳 run: docker push ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} - naaga_prod_ec2_deploy: - needs: github_actions_setting - runs-on: naaga - - steps: - name: πŸ™ μ‰˜ 슀크립트 μ‹€ν–‰ 쀑 ... πŸ™ - run: | - cd /home/ubuntu/prod - sudo ./deploy_prod.sh + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.SERVER_IP }} + username: ${{ secrets.SERVER_SSH_ID }} + key: ${{ secrets.SERVER_SSH_KEY }} + port: ${{ secrets.SERVER_SSH_PORT }} + script: | + cd /home/ubuntu/naaga/prod + sudo sh ./deploy.sh diff --git a/backend/src/main/java/com/now/naaga/NaagaApplication.java b/backend/src/main/java/com/now/naaga/NaagaApplication.java index cee0329da..6fb6611bf 100644 --- a/backend/src/main/java/com/now/naaga/NaagaApplication.java +++ b/backend/src/main/java/com/now/naaga/NaagaApplication.java @@ -11,5 +11,4 @@ public class NaagaApplication { public static void main(String[] args) { SpringApplication.run(NaagaApplication.class, args); } - }