Fixing configs

jackiehan · May 25, 2015 · 140300d · 140300d
1 parent 7bdc1b4
commit 140300d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/api-gateway-microservice/src/main/docker/Dockerfile b/api-gateway-microservice/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:7
+FROM java:8
 VOLUME /tmp
 ADD api-gateway-microservice-0.1.0.jar app.jar
 RUN bash -c 'touch /app.jar'

diff --git a/api-gateway-microservice/src/main/resources/application.yml b/api-gateway-microservice/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8762
+  port: 10000
 
 endpoints:
   restart:
@@ -11,11 +11,9 @@ endpoints:
 
 eureka:
   instance:
-    leaseRenewalIntervalInSeconds: 10
-    metadataMap:
-      instanceId: ${vcap.application.instance_id:${spring.application.name}:${spring.application.instance_id:${server.port}}}
+    hostname: gateway
   client:
-    region: default
-    registryFetchIntervalSeconds: 5
-    availabilityZones:
-      default: ${APPLICATION_DOMAIN:${DOMAIN:defaultZone}}
+    registerWithEureka: true
+    fetchRegistry: false
+    serviceUrl:
+      defaultZone: http://discovery:8761/eureka/
diff --git a/api-gateway-microservice/src/main/resources/bootstrap.yml b/api-gateway-microservice/src/main/resources/bootstrap.yml
@@ -3,6 +3,6 @@ spring:
     name: gateway
   cloud:
     config:
-      uri: http://localhost:8888/gateway/cloud
+      uri: http://configserver:8888
 encrypt:
   failOnError: false
diff --git a/config-microservice/src/main/resources/application.yml b/config-microservice/src/main/resources/application.yml
@@ -3,7 +3,7 @@ server:
 
 eureka:
   instance:
-    hostname: config
+    hostname: configserver
   client:
     registerWithEureka: true
     fetchRegistry: false

diff --git a/recommendation-microservice/src/main/resources/bootstrap.yml b/recommendation-microservice/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: cloud
+    active: docker
   application:
     name: recommendation
 spring.cloud.config.discovery.enabled: "true"