diff --git a/.github/workflows/deploy-admin-docker.yml b/.github/workflows/deploy-admin-docker.yml index b4fa498..fbcb385 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 0f7c440..0683ae8 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 ac0be6a..312bfca 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 708435f..450ecc7 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 ae75717..1d8d85f 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 2460ef2..a08337b 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); } } -