From b98f6c3fa66dbd9c415330ec03147d38e07a0c6b Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 8 Jul 2025 19:55:28 +0900 Subject: [PATCH 1/2] =?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=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-admin-docker.yml | 9 +++++---- docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index 49c52994..468bca8e 100644 --- a/.github/workflows/deploy-admin-docker.yml +++ b/.github/workflows/deploy-admin-docker.yml @@ -56,11 +56,12 @@ jobs: - name: Build and Push Docker Image run: | - docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/admin/nowait-app-admin-api ./nowait-app-admin-api - docker push ${{ secrets.DOCKERHUB_USERNAME }}/admin/nowait-app-admin-api - + 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 }} - deploy: + + +deploy: name: Deploy to EC2 runs-on: ubuntu-latest needs: build-with-gradle diff --git a/docker-compose.yml b/docker-compose.yml index 853ac661..60c052da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # build: # context: nowait-app-admin-api # dockerfile: Dockerfile - image: jihuneddie/admin/nowait-app-admin-api:latest + image: jihuneddie/nowait_dev:admin- container_name: nowait-app-admin-api ports: From 329991d2bf5f1377f50326dd4d844786a9e67642 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 8 Jul 2025 19:55:45 +0900 Subject: [PATCH 2/2] =?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=EC=88=98=EC=A0=95?= 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); } } +