From 029583b45a7d32f6b40c436e3e0e9844579fe50e Mon Sep 17 00:00:00 2001
From: Jihun Kim <zh1229@naver.com>
Date: Tue, 8 Jul 2025 22:35:59 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=8F=84=EC=BB=A4=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EC=A6=88=20=EC=8B=A4=ED=96=89=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=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     |  6 +++++
 docker-compose.yml                            | 26 +++++++++----------
 .../java/com/nowait/ApiAdminApplication.java  |  1 +
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml
index ecb05971..b5c0b185 100644
--- a/.github/workflows/deploy-admin-docker.yml
+++ b/.github/workflows/deploy-admin-docker.yml
@@ -80,6 +80,12 @@ jobs:
           source: "docker-compose.yml"
           target: ${{ env.EC2_DEPLOY_PATH }}
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+
       - name: Deploy to EC2
         uses: appleboy/ssh-action@master
         env:
diff --git a/docker-compose.yml b/docker-compose.yml
index 7833a531..f8fcc56d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,25 +19,25 @@ services:
     image: jihuneddie/nowait_dev:admin
     container_name: nowait-app-admin-api
     ports:
-      - "8085:8085"
+      - "8086:8085"
     depends_on:
       - mysql
     volumes:
       - ./nowait-app-admin-api:/app
     restart: always
 
-#  nowait-app-user-api:
-#    build:
-#      context: nowait-app-user-api
-#      dockerfile: Dockerfile
-#    container_name: nowait-app-user-api
-#    ports:
-#      - "8081:8081"
-#    depends_on:
-#      - mysql
-#    volumes:
-#      - ./nowait-app-user-api:/app
-#    restart: always
+  nowait-app-user-api:
+    build:
+      context: nowait-app-user-api
+      dockerfile: Dockerfile
+    container_name: nowait-app-user-api
+    ports:
+      - "8081:8081"
+    depends_on:
+      - mysql
+    volumes:
+      - ./nowait-app-user-api:/app
+    restart: always
 
 volumes:
   mysql_data:
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 1098599d..363e737d 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,3 +10,4 @@ public static void main(String[] args) {
 		org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args);
 	}
 }
+