Now handles dependencies more efficiently

zhoozhoo · Aug 9, 2020 · 05d2408 · 05d2408
1 parent ab61ca1
commit 05d2408
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,24 +16,13 @@ services:
     image: zhoozhoo/spring-cloud-auth-server
     container_name: auth-server
     ports:
-      - 8180:8180
+      - 8180:8080
     networks:
       - spring-cloud-network
 
   config-server:
     image: zhoozhoo/spring-cloud-config-server
     container_name: config-server
-    depends_on:
-      - auth-server
-    entrypoint:
-      [
-        "./dockerize",
-        "-wait=tcp://auth-server:8180",
-        "-timeout=120s",
-        "--",
-        "java",
-        "org.springframework.boot.loader.JarLauncher",
-      ]
     ports:
       - 8888:8888
     networks:
@@ -64,10 +53,13 @@ services:
     depends_on:
       - config-server
       - discovery-server
+      - auth-server
     entrypoint:
       [
         "./dockerize",
+        "-wait=tcp://config-server:8888",
         "-wait=tcp://discovery-server:8761",
+        "-wait=tcp://host.docker.internal:8180",
         "-timeout=120s",
         "--",
         "java",
@@ -84,10 +76,13 @@ services:
     depends_on:
       - config-server
       - discovery-server
+      - auth-server
     entrypoint:
       [
         "./dockerize",
+        "-wait=tcp://config-server:8888",
         "-wait=tcp://discovery-server:8761",
+        "-wait=tcp://host.docker.internal:8180",
         "-timeout=120s",
         "--",
         "java",
@@ -104,10 +99,13 @@ services:
     depends_on:
       - config-server
       - discovery-server
+      - auth-server
     entrypoint:
       [
         "./dockerize",
+        "-wait=tcp://config-server:8888",
         "-wait=tcp://discovery-server:8761",
+        "-wait=tcp://host.docker.internal:8180",
         "-timeout=120s",
         "--",
         "java",
@@ -124,13 +122,16 @@ services:
     depends_on:
       - config-server
       - discovery-server
+      - auth-server
       - guest-service
       - reservation-service
       - room-service
     entrypoint:
       [
         "./dockerize",
+        "-wait=tcp://config-server:8888",
         "-wait=tcp://discovery-server:8761",
+        "-wait=tcp://host.docker.internal:8180",
         "-timeout=120s",
         "--",
         "java",
@@ -151,7 +152,9 @@ services:
     entrypoint:
       [
         "./dockerize",
+        "-wait=tcp://config-server:8888",
         "-wait=tcp://discovery-server:8761",
+        "-wait=tcp://host.docker.internal:8180",
         "-timeout=120s",
         "--",
         "java",
@@ -171,6 +174,7 @@ services:
     entrypoint:
       [
         "./dockerize",
+        "-wait=tcp://config-server:8888",
         "-wait=tcp://discovery-server:8761",
         "-timeout=120s",
         "--",