SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The format of the JAVA_OPTS changed in the deployer 1.1

Browse Source
This commit is contained in:
Dave Syer
2016-12-02 14:50:34 +00:00
parent 8aa3b6b302
commit 36f91edcae
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerProperties.java
View File

@@ -150,7 +150,8 @@ public class DeployerProperties {
private Map<String, String> enabled = new LinkedHashMap<>();
/**
* A map of "deployment" properties passed to the deployer (not the app) when this
* app is launched. You can use <code>javaOpts</code> here to pass JVM args to a local deployer.
* app is launched. You can use <code>spring.cloud.deployer.local.javaOpts</code>
* here to pass JVM args to a local deployer.
*/
private Map<String, String> properties = new LinkedHashMap<>();

16
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml
View File

@@ -1,7 +1,7 @@
dt:
pre: maven://org.springframework.cloud.launcher:spring-cloud-launcher-
ver: ${launcher.version}
opts: -Xmx128m
mem: 128m
spring:
cloud:
@@ -21,12 +21,12 @@ spring:
waitUntilStarted: true
order: -100
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
dataflow:
coordinates: ${dt.pre}dataflow:${dt.ver}
port: 9393
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
eureka:
coordinates: ${dt.pre}eureka:${dt.ver}
port: 8761
@@ -34,7 +34,7 @@ spring:
disabled:
eureka.client.enabled: false
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
h2:
coordinates: ${dt.pre}h2:${dt.ver}
port: 9095
@@ -44,12 +44,12 @@ spring:
enabled:
spring.datasource.url: jdbc:h2:tcp://localhost:9096/./target/test
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
hystrixdashboard:
coordinates: ${dt.pre}hystrixdashboard:${dt.ver}
port: 7979
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
kafka:
coordinates: ${dt.pre}kafka:${dt.ver}
port: 9091
@@ -58,11 +58,11 @@ spring:
disabled:
spring.cloud.bus.enabled: false
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
zipkin:
coordinates: ${dt.pre}zipkin:${dt.ver}
port: 9411
order: 0
properties:
spring.cloud.deployer.local.javaOpts: ${dt.opts}
spring.cloud.deployer.memory: ${dt.mem}
deploy: ${launcher.deploy:configserver,eureka}