From 90865e3f48748eff85c452135ba10ac7a14bf637 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 8 Jul 2025 22:07:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=8F=84=EC=BB=A4=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=ED=83=9C=EA=B7=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 | 4 +-- docker-compose.yml | 34 ++++++++++------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index ecee918e..03218c73 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -56,8 +56,8 @@ jobs: - name: Build and Push Docker Image run: | - docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin-${{ github.sha }} ./nowait-app-admin-api - docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin-${{ github.sha }} + docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin ./nowait-app-admin-api + docker push ${{ secrets.DOCKERHUB_USERNAME }}/nowait_dev:admin diff --git a/docker-compose.yml b/docker-compose.yml index 60c052da..b0e5c509 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,32 +18,28 @@ services: # build: # context: nowait-app-admin-api # dockerfile: Dockerfile - image: jihuneddie/nowait_dev:admin- - container_name: - nowait-app-admin-api + image: jihuneddie/nowait_dev:admin + container_name: nowait-app-admin-api ports: - "8085:8086" depends_on: - mysql volumes: - ./nowait-app-admin-api:/app - restart: - always + 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: From c5a456c061cedb57b37ff71b7ba68828d632b611 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 8 Jul 2025 22:07:39 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=8F=84=EC=BB=A4=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=ED=83=9C=EA=B7=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nowait/ApiAdminApplication.java | 1 + 1 file changed, 1 insertion(+) 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); } } +