From 58bdcaf55d4644fb91ad632b6c536d6fd1584b57 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 8 Aug 2025 15:30:52 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=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=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-admin-docker.yml | 8 ++++---- .github/workflows/deploy-user-docker.yml | 2 +- docker-compose.admin.yml | 6 +++--- docker-compose.user.yml | 4 ++-- .../src/main/java/com/nowait/ApiAdminApplication.java | 1 - .../src/main/java/com/nowait/ApiUserApplication.java | 1 - 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index b4fa498f..fbcb3858 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -15,7 +15,7 @@ on: - 'gradle/**' env: - DOCKERHUB_REPO: jihuneddie/nowait_dev + DOCKERHUB_REPO: jihuneddie/nowait_dev_admin DIVISION: admin EC2_DEPLOY_PATH: /home/ubuntu/spring-github-action-admin-docker @@ -57,9 +57,9 @@ jobs: - name: Build and Push Docker Image run: | TAG=${GITHUB_SHA::7} - docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:${TAG} -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:latest ./nowait-app-admin-api - docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:${TAG} - docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:latest + docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev_admin:${TAG} -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev_admin:latest ./nowait-app-admin-api + docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev_admin:${TAG} + docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev_admin:latest diff --git a/.github/workflows/deploy-user-docker.yml b/.github/workflows/deploy-user-docker.yml index 0f7c440d..0683ae85 100644 --- a/.github/workflows/deploy-user-docker.yml +++ b/.github/workflows/deploy-user-docker.yml @@ -15,7 +15,7 @@ on: - 'gradle/**' env: - DOCKERHUB_REPO: jihuneddie/nowait_dev + DOCKERHUB_REPO: jihuneddie/nowait_dev_user DIVISION: user EC2_DEPLOY_PATH: /home/ubuntu/spring-github-action-user-docker diff --git a/docker-compose.admin.yml b/docker-compose.admin.yml index ac0be6a7..312bfcaa 100644 --- a/docker-compose.admin.yml +++ b/docker-compose.admin.yml @@ -13,14 +13,14 @@ services: - mysql_data:/var/lib/mysql nowait-app-admin-api: - image: jihuneddie/nowait_dev:latest + image: jihuneddie/nowait_dev_admin:latest container_name: nowait-app-admin-api ports: - "8085:8085" depends_on: - mysql - volumes: - - ./nowait-app-admin-api:/app +# volumes: +# - ./nowait-app-admin-api:/app restart: always volumes: diff --git a/docker-compose.user.yml b/docker-compose.user.yml index 708435f9..450ecc7c 100644 --- a/docker-compose.user.yml +++ b/docker-compose.user.yml @@ -19,8 +19,8 @@ services: - "8081:8081" depends_on: - mysql - volumes: - - ./nowait-app-user-api:/app +# volumes: +# - ./nowait-app-user-api:/app restart: always volumes: 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 ae757172..1d8d85f7 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 @@ -14,4 +14,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 2460ef23..a08337be 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 @@ -13,4 +13,3 @@ public static void main(String[] args) { SpringApplication.run(ApiUserApplication.class, args); } } -