From e5f9f2977b1414333affd4e5b9ff58e45aea8be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=AF=E1=86=AB=E1=84=8C=E1=85=A1=E1=86=BC?= =?UTF-8?q?=E1=84=89=E1=85=AE=E1=86=AB?= Date: Thu, 3 Jul 2025 13:06:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix(cd):=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=82=B4=20JSON=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=ED=8C=8C=EC=8B=B1=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/DOCKER-CD-STAGING.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/DOCKER-CD-STAGING.yml b/.github/workflows/DOCKER-CD-STAGING.yml index b27ee66..7838acf 100644 --- a/.github/workflows/DOCKER-CD-STAGING.yml +++ b/.github/workflows/DOCKER-CD-STAGING.yml @@ -7,7 +7,6 @@ on: jobs: ci: runs-on: ubuntu-24.04 - steps: # 1. 소스 코드 체크아웃 - name: Checkout @@ -55,7 +54,6 @@ jobs: needs: ci runs-on: ubuntu-24.04 environment: staging - steps: - name: Deploy to Staging Server uses: appleboy/ssh-action@master @@ -64,13 +62,15 @@ jobs: username: ${{ secrets.STAGING_SERVER_USER }} key: ${{ secrets.STAGING_SERVER_KEY }} script: | + # 오류 발생 시 즉시 스크립트 중단 set -e + # --- 변수 설정 --- APP_NAME="terning2025-staging" IMAGE_NAME="terningpoint/terning2025-staging" NGINX_CONFIG_PATH="/etc/nginx" SERVICE_URL_INC_PATH="${NGINX_CONFIG_PATH}/conf.d/service-url-staging.inc" - + echo "### 1. 최신 Docker 이미지를 pull합니다." docker pull ${IMAGE_NAME}:latest @@ -87,7 +87,6 @@ jobs: OLD_CONTAINER_NAME="${APP_NAME}-8081" fi - # 최초 배포인지 확인 if [ -z "$IS_BLUE_RUNNING" ] && [ -z "$(docker ps -q --filter "name=${APP_NAME}" --filter "publish=8081")" ]; then echo " > 현재 실행중인 서비스가 없습니다. 최초 배포를 시작합니다." echo " > 새로 실행할 포트(Green): ${NEW_PORT}" @@ -103,7 +102,7 @@ jobs: -e SPRING_PROFILES_ACTIVE=staging \ -e SPRING_DATASOURCE_URL='${{ secrets.DB_URL }}' \ -e SPRING_DATASOURCE_USERNAME=${{ secrets.DB_USERNAME }} \ - -e SPRING_DATASOURCE_PASSWORD=${{ secrets.DB_PASSWORD }} \ + -e SPRING_DATASOURCE_PASSWORD='${{ secrets.DB_PASSWORD }}' \ -e SPRING_JPA_DEFAULT_SCHEMA=${{ secrets.SPRING_JPA_DEFAULT_SCHEMA }} \ -e JWT_SECRET_KEY='${{ secrets.JWT_SECRET_KEY }}' \ -e JWT_ACCESS_TOKEN_EXPIRED=${{ secrets.JWT_ACCESS_TOKEN_EXPIRED }} \ From fc93d1bbc5b691dbfe1ac403313aabb621577d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=AF=E1=86=AB=E1=84=8C=E1=85=A1=E1=86=BC?= =?UTF-8?q?=E1=84=89=E1=85=AE=E1=86=AB?= Date: Thu, 3 Jul 2025 13:12:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor(cd):=20=EB=B0=B0=ED=8F=AC=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A0=84=EB=8B=AC=20=EC=95=88=EC=A0=95?= =?UTF-8?q?=EC=84=B1=20=EA=B0=95=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/DOCKER-CD-STAGING.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/DOCKER-CD-STAGING.yml b/.github/workflows/DOCKER-CD-STAGING.yml index 7838acf..ee71462 100644 --- a/.github/workflows/DOCKER-CD-STAGING.yml +++ b/.github/workflows/DOCKER-CD-STAGING.yml @@ -101,9 +101,9 @@ jobs: -p ${NEW_PORT}:8080 \ -e SPRING_PROFILES_ACTIVE=staging \ -e SPRING_DATASOURCE_URL='${{ secrets.DB_URL }}' \ - -e SPRING_DATASOURCE_USERNAME=${{ secrets.DB_USERNAME }} \ + -e SPRING_DATASOURCE_USERNAME='${{ secrets.DB_USERNAME }}' \ -e SPRING_DATASOURCE_PASSWORD='${{ secrets.DB_PASSWORD }}' \ - -e SPRING_JPA_DEFAULT_SCHEMA=${{ secrets.SPRING_JPA_DEFAULT_SCHEMA }} \ + -e SPRING_JPA_DEFAULT_SCHEMA='${{ secrets.SPRING_JPA_DEFAULT_SCHEMA }}' \ -e JWT_SECRET_KEY='${{ secrets.JWT_SECRET_KEY }}' \ -e JWT_ACCESS_TOKEN_EXPIRED=${{ secrets.JWT_ACCESS_TOKEN_EXPIRED }} \ -e JWT_REFRESH_TOKEN_EXPIRED=${{ secrets.JWT_REFRESH_TOKEN_EXPIRED }} \