From 32bdfe53e8668f56f9c6a49f8a5987bece452631 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 9 Jul 2025 00:05:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=8F=84=EC=BB=A4=20=EB=B0=B0?= =?UTF-8?q?=ED=8F=AC=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-admin-docker.yml | 1 + .github/workflows/deploy-user-docker.yml | 1 + nowait-app-admin-api/Dockerfile | 3 +-- nowait-app-user-api/Dockerfile | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index b5c0b185..0d6dfbc6 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -100,6 +100,7 @@ jobs: envs: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION script: | cd ${{ env.EC2_DEPLOY_PATH }} + sudo docker rm -f nowait-app-admin-api || true sudo docker-compose -p nowait_dev pull nowait-app-admin-api sudo docker-compose -p nowait_dev up -d nowait-app-admin-api diff --git a/.github/workflows/deploy-user-docker.yml b/.github/workflows/deploy-user-docker.yml index dec033a4..b059db61 100644 --- a/.github/workflows/deploy-user-docker.yml +++ b/.github/workflows/deploy-user-docker.yml @@ -97,6 +97,7 @@ jobs: envs: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION script: | cd ${{ env.EC2_DEPLOY_PATH }} + sudo docker rm -f nowait-app-user-api || true sudo docker-compose -p nowait_dev pull nowait-app-user-api sudo docker-compose -p nowait_dev up -d nowait-app-user-api diff --git a/nowait-app-admin-api/Dockerfile b/nowait-app-admin-api/Dockerfile index fd4cd318..8b17c261 100644 --- a/nowait-app-admin-api/Dockerfile +++ b/nowait-app-admin-api/Dockerfile @@ -3,6 +3,5 @@ ARG JAR_FILE=./build/libs/*.jar COPY ${JAR_FILE} nowait-app-admin-api.jar ARG PROFILE=admin -ENV PROFILE=${PROFILE} -CMD ["java", "-jar", "nowait-app-admin-api.jar", "--spring.profiles.active=${PROFILE}", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"] +CMD ["java", "-jar", "nowait-app-admin-api.jar", "--spring.profiles.active=admin", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"] diff --git a/nowait-app-user-api/Dockerfile b/nowait-app-user-api/Dockerfile index 32684f04..8daac893 100644 --- a/nowait-app-user-api/Dockerfile +++ b/nowait-app-user-api/Dockerfile @@ -3,6 +3,5 @@ ARG JAR_FILE=./build/libs/*.jar COPY ${JAR_FILE} nowait-app-user-api.jar ARG PROFILE=user -ENV PROFILE=${PROFILE} -CMD ["java", "-jar", "nowait-app-user-api.jar", "--spring.profiles.active=${PROFILE}", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"] +CMD ["java", "-jar", "nowait-app-user-api.jar", "--spring.profiles.active=user", "-Djava.security.egd=file:/dev/./urandom", "-Duser.timezone=Asia/Seoul"] From 0b340167f2a75cc984e205c0589c4482d14698c5 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 9 Jul 2025 00:06:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=B0=B0=ED=8F=AC=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nowait/ApiAdminApplication.java | 1 - .../src/main/java/com/nowait/ApiUserApplication.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java index 363e737d..1098599d 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java @@ -10,4 +10,3 @@ public static void main(String[] args) { org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args); } } - diff --git a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java index 07db6d34..8e25d58f 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java +++ b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java @@ -11,3 +11,4 @@ public static void main(String[] args) { SpringApplication.run(ApiUserApplication.class, args); } } +