Taking config to filesystem for docker

hiteshjoshi1 · Mar 8, 2018 · 52e023b · 52e023b
1 parent 3cac909
commit 52e023b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/config/src/main/resources/application.yml b/config/src/main/resources/application.yml
@@ -8,9 +8,7 @@ spring:
     config:
       server:
         git:
-          uri: https://github.com/hiteshjoshi1/microservice-docker-cart-config.git
-          username: hiteshjoshi1
-          password: test
+          uri: file:/data/microservice-docker-cart-config
         health:
           repositories:
              customer-service:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,7 +24,13 @@ services:
       - microservicesnet
     volumes:
       - /home/hitesh/jarloc:/data
-    command: -jar -Dspring.profiles.active=docker /data/servicediscovery-0.0.1-SNAPSHOT.jar 
+    command: -jar -Dspring.profiles.active=docker /data/servicediscovery-0.0.1-SNAPSHOT.jar
+    healthcheck:
+      test: curl --fail -s http://localhost:1111/info || exit 1
+      interval: 1m30s
+      timeout: 10s
+      retries: 3 
+
 
   config:
     image: hiteshjoshi1/microservice-docker-cart-example
@@ -37,12 +43,16 @@ services:
     volumes:
       - /home/hitesh/jarloc:/data
     command: -jar -Dspring.profiles.active=docker /data/config-0.0.1-SNAPSHOT.jar
+    depends_on:
+       eureka:
+         condition: service_healthy 
     healthcheck:
       test: curl --fail -s http://localhost:5555/info || exit 1
       interval: 1m30s
       timeout: 10s
       retries: 3 
 
+
   customer1:
     image: hiteshjoshi1/microservice-docker-cart-example
     container_name: customer1

diff --git a/zipkinTimer/src/main/resources/application.yml b/zipkinTimer/src/main/resources/application.yml
@@ -13,7 +13,7 @@ eureka:
        preferIpAddress: true 
 
 server:
-  port: 9411
+  port: ${zipkin.port} 
 
 ---
 
@@ -23,7 +23,7 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:${invoice.discovery.port}/eureka/ # using eureka instead of localhost
+      defaultZone: http://localhost:${discovery.port}/eureka/ # using eureka instead of localhost
 
 
 
@@ -35,6 +35,6 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://eureka:${invoice.discovery.port}/eureka/ # using eureka instead of localhost
+      defaultZone: http://eureka:${discovery.port}/eureka/ # using eureka instead of localhost
 
-
+