From 4053d348276fdbf87879c6f1075dac2c1cd1a75f Mon Sep 17 00:00:00 2001 From: 82everywin <82everywin@gmail.com> Date: Wed, 29 Jan 2025 03:55:28 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]=20=EB=B0=B0=ED=8F=AC=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=20pull=20=EC=A4=84=EC=9D=B4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-cd.yml | 7 +------ src/main/resources/application.properties | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index e4f3b62..a7c345f 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -41,10 +41,8 @@ jobs: # .gitignore에 있는 properties파일 추가 - name: Add prod_properties run: | - touch ./src/main/resources/application.properties touch ./src/main/resources/application-oauth.properties touch ./src/main/resources/application-private.properties - echo "${{ secrets.PROPERTIES }}" > ./src/main/resources/application.properties echo "${{ secrets.OAUTHPROPERTIES }}" > ./src/main/resources/application-oauth.properties echo "${{ secrets.PRIVATEPROPERTIES }}" > ./src/main/resources/application-private.properties @@ -55,8 +53,7 @@ jobs: host: ${{ secrets.EC2_HOST }} username: ubuntu key: ${{ secrets.EC2_KEY }} - source: | - ./ + source: ./* target: ~/backend/ # Deploy to EC2 @@ -69,8 +66,6 @@ jobs: debug: true script: | cd ~/backend - docker pull ${{ secrets.DOCKER_USERNAME }}/bookmile-app:latest - chmod 644 .env sudo docker pull ${{ secrets.DOCKER_USERNAME }}/bookmile-app:latest sudo docker-compose -f docker-compose.yml down sudo docker-compose -f docker-compose.yml up --build -d diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a96d868..2d4e8c3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,8 @@ spring.config.import=optional:classpath:application-private.properties spring.profiles.include=oauth #swagger -swagger.server-url=http://localhost:8080 +swagger.local-url=http://localhost:8080 +swagger.server-url=https://bookmile.site #MySQL spring.jpa.properties.hibernate.show_sql=true