From 5eab3ff700d1b7d79a8e2e885143ed3198ae497f Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Wed, 10 Jun 2026 16:25:09 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[FIX]=20=EA=B0=9C=EB=B0=9C=20CI=20/=20CD=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-develop.yml | 15 +++++++++++++++ .github/workflows/CI-develop.yml | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/.github/workflows/CD-develop.yml b/.github/workflows/CD-develop.yml index e047b022..315849f4 100644 --- a/.github/workflows/CD-develop.yml +++ b/.github/workflows/CD-develop.yml @@ -30,6 +30,13 @@ jobs: shell: bash - name: Build with Gradle + env: + DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} + DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test -Dspring.profiles.active=dev shell: bash @@ -54,10 +61,18 @@ jobs: steps: - name: Run Docker container uses: appleboy/ssh-action@master + env: + DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} + DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} with: host: ${{ secrets.DEVELOP_SERVER_IP }} username: ${{ secrets.DEVELOP_SERVER_USER }} key: ${{ secrets.DEVELOP_SERVER_KEY }} + envs: DEV_DB_NAME,DEV_DB_PWD,APPLE_TEAM_ID,APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY script: | cd ~ ./deploy.sh diff --git a/.github/workflows/CI-develop.yml b/.github/workflows/CI-develop.yml index 6e4cb6b9..53c51170 100644 --- a/.github/workflows/CI-develop.yml +++ b/.github/workflows/CI-develop.yml @@ -30,5 +30,12 @@ jobs: shell: bash - name: Build with Gradle + env: + DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} + DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test shell: bash \ No newline at end of file From 83570fc60be17dd670f8d0f086b3d777456a87af Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Wed, 10 Jun 2026 17:02:02 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[FIX]=20Dockerfile=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aa8f9ff6..90832381 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ COPY config-repo/ /app/config-repo/ COPY ./build/libs/WSS-Server-0.0.1-SNAPSHOT.jar /app/websoso.jar -ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "websoso.jar"] +ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "websoso.jar"] \ No newline at end of file From ff95e282937af04765c40669bd51373f399dde8c Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Wed, 10 Jun 2026 17:12:18 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[FIX]=20=EC=9E=98=EB=AA=BB=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=ED=95=9C=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CD-develop.yml b/.github/workflows/CD-develop.yml index 315849f4..cddc2850 100644 --- a/.github/workflows/CD-develop.yml +++ b/.github/workflows/CD-develop.yml @@ -65,7 +65,7 @@ jobs: DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} with: From 5d06a5e44f010ceff55f5dc03b705c49da86a39c Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Wed, 10 Jun 2026 17:34:05 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[FIX]=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=A0=84=EC=B2=B4=20=EB=B6=88=EB=9F=AC?= =?UTF-8?q?=EC=98=A4=EA=B3=A0=20=ED=8C=8C=EC=8B=B1=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-develop.yml | 6 +++--- .github/workflows/CI-develop.yml | 2 +- src/main/resources/application.yml | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CD-develop.yml b/.github/workflows/CD-develop.yml index cddc2850..a988d5b4 100644 --- a/.github/workflows/CD-develop.yml +++ b/.github/workflows/CD-develop.yml @@ -34,7 +34,7 @@ jobs: DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test -Dspring.profiles.active=dev @@ -65,14 +65,14 @@ jobs: DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} + DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} with: host: ${{ secrets.DEVELOP_SERVER_IP }} username: ${{ secrets.DEVELOP_SERVER_USER }} key: ${{ secrets.DEVELOP_SERVER_KEY }} - envs: DEV_DB_NAME,DEV_DB_PWD,APPLE_TEAM_ID,APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY + envs: DEV_DB_NAME,DEV_DB_PWD,APPLE_TEAM_ID,DEV_APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY script: | cd ~ ./deploy.sh diff --git a/.github/workflows/CI-develop.yml b/.github/workflows/CI-develop.yml index 53c51170..2215c364 100644 --- a/.github/workflows/CI-develop.yml +++ b/.github/workflows/CI-develop.yml @@ -34,7 +34,7 @@ jobs: DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + DEV_APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0111a7e0..45f012c7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,11 @@ spring: profiles: active: local - config: - import: - - optional:file:./config-repo/application-common.yml - - optional:file:./config-repo/application-${spring.profiles.active}.yml +config: + import: + - optional:file:./config-repo/ + +# config: +# import: +# - optional:file:./config-repo/application-common.yml +# - optional:file:./config-repo/application-${spring.profiles.active}.yml From 07132e2c2f311492298b31c13c4c8a054dd0bacf Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Wed, 10 Jun 2026 17:40:43 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[FIX]=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=A0=84=EC=B2=B4=20=EB=B6=88=EB=9F=AC?= =?UTF-8?q?=EC=98=A4=EA=B3=A0=20=ED=8C=8C=EC=8B=B1=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 45f012c7..4c797e51 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: profiles: active: local -config: - import: - - optional:file:./config-repo/ + config: + import: + - optional:file:./config-repo/ # config: # import: From c097f09f1f6fc8580750f6803176de2dcaf55e6a Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Wed, 10 Jun 2026 23:33:24 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[FIX]=20=ED=99=98=EA=B2=BD=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=A0=84=EC=B2=B4=20=EB=B6=88=EB=9F=AC?= =?UTF-8?q?=EC=98=A4=EA=B3=A0=20=ED=8C=8C=EC=8B=B1=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI-develop.yml | 2 +- Dockerfile | 3 +++ src/main/resources/application.yml | 8 ++------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI-develop.yml b/.github/workflows/CI-develop.yml index 2215c364..123f48b7 100644 --- a/.github/workflows/CI-develop.yml +++ b/.github/workflows/CI-develop.yml @@ -34,7 +34,7 @@ jobs: DEV_DB_NAME: ${{ secrets.DEV_DB_NAME }} DEV_DB_PWD: ${{ secrets.DEV_DB_PWD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - DEV_APPLE_KEY_NAME: ${{ secrets.APPLE_KEY_NAME }} + DEV_APPLE_KEY_NAME: ${{ secrets.DEV_APPLE_KEY_NAME }} S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test diff --git a/Dockerfile b/Dockerfile index 90832381..1245deee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,9 @@ FROM amd64/amazoncorretto:17 WORKDIR /app COPY config-repo/ /app/config-repo/ +RUN test -f /app/config-repo/application-dev.yml \ + && test -f /app/config-repo/application-prod.yml \ + && test -f /app/config-repo/application-common.yml COPY ./build/libs/WSS-Server-0.0.1-SNAPSHOT.jar /app/websoso.jar diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4c797e51..0111a7e0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,9 +4,5 @@ spring: config: import: - - optional:file:./config-repo/ - -# config: -# import: -# - optional:file:./config-repo/application-common.yml -# - optional:file:./config-repo/application-${spring.profiles.active}.yml + - optional:file:./config-repo/application-common.yml + - optional:file:./config-repo/application-${spring.profiles.active}.yml From 8786aa1d4b49989cd33a6f67b227cde34e407df2 Mon Sep 17 00:00:00 2001 From: GiJungPark Date: Thu, 11 Jun 2026 01:06:44 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[FIX]=20=EC=9A=B4=EC=98=81=20Deploy=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD.yml | 15 +++++++++++++++ .github/workflows/CI.yml | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 4021c197..1179b362 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -30,6 +30,13 @@ jobs: shell: bash - name: Build with Gradle + env: + PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }} + PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test -Dspring.profiles.active=prod shell: bash @@ -54,10 +61,18 @@ jobs: steps: - name: Run Docker container uses: appleboy/ssh-action@master + env: + PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }} + PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} with: host: ${{ secrets.RELEASE_SERVER_IP }} username: ${{ secrets.RELEASE_SERVER_USER }} key: ${{ secrets.RELEASE_SERVER_KEY }} + envs: PROD_DB_NAME,PROD_DB_PWD,APPLE_TEAM_ID,PROD_APPLE_KEY_NAME,S3_ACCESS_KEY,S3_SECRET_KEY script: | cd ~ ./deploy.sh diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3e1a5044..58173298 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -30,5 +30,12 @@ jobs: shell: bash - name: Build with Gradle + env: + PROD_DB_NAME: ${{ secrets.PROD_DB_NAME }} + PROD_DB_PWD: ${{ secrets.PROD_DB_PWD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + PROD_APPLE_KEY_NAME: ${{ secrets.PROD_APPLE_KEY_NAME }} + S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }} + S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }} run: ./gradlew build -x test - shell: bash + shell: bash \ No newline at end of file