diff --git a/docker-compose.user.yml b/docker-compose.user.yml index d996fb5..baab309 100644 --- a/docker-compose.user.yml +++ b/docker-compose.user.yml @@ -8,7 +8,7 @@ services: MYSQL_USER: developer MYSQL_PASSWORD: gtable1118! ports: - - "3306:3306" + - "3307:3306" volumes: - mysql_data:/var/lib/mysql 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 a08337b..2460ef2 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,3 +13,4 @@ public static void main(String[] args) { SpringApplication.run(ApiUserApplication.class, args); } } + diff --git a/scripts/deploy-admin-docker.sh b/scripts/deploy-admin-docker.sh index 1a19c8f..93297fb 100644 --- a/scripts/deploy-admin-docker.sh +++ b/scripts/deploy-admin-docker.sh @@ -22,8 +22,8 @@ echo "Cleaning up old containers…" docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin down echo "3. start container" -sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin pull nowait-app-admin-api -sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin up -d nowait-app-admin-api +sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin pull nowait-app-admin-api prometheus-admin grafana-admin +sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin up -d nowait-app-admin-api prometheus-admin grafana-admin echo "4. check container status" NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-admin-api")