Fixes for DC/OS #98
Fixes for DC/OS #98
Conversation
| @@ -454,7 +454,7 @@ case object BasicApp extends App { | |||
|
|
|||
| javaOptions in SbtNativePackager.Universal ++= ( | |||
| if (memory.value > 0L && enableCGroupMemoryLimit.value) | |||
| Vector("-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap") | |||
| Vector("-J-XX:+UnlockExperimentalVMOptions", "-J-XX:+UseCGroupMemoryLimitForHeap") | |||
There was a problem hiding this comment.
| @@ -1,4 +1,4 @@ | |||
| #!/usr/bin/env sh | |||
| #!/usr/bin/env bash | |||
There was a problem hiding this comment.
The start script that sbt-native-packager uses requires bash, so we already (i.e. prior to this PR) require bash to be part of the base image.
There's room for a future enhancement here to save the 2MB bash adds to the container by writing our own JVM startup script and not relying on this bash syntax: ${!IDX_VAR}
note: don't use its AshScript feature, it's broken in various ways
|
|
||
| if [ "$RP_DEBUG" = 1 ] && hash env &>/dev/null && hash sort &>/dev/null; then | ||
| 1>&2 env | sort | ||
| fi |
There was a problem hiding this comment.
this (RP_DEBUG) will come in handy during support cases
| @@ -381,7 +381,7 @@ case object BasicApp extends App { | |||
| environmentVariables := Map.empty, | |||
| startScriptLocation := "/rp-start", | |||
| secrets := Set.empty, | |||
| reactiveLibVersion := "0.5.0", | |||
| reactiveLibVersion := "0.7.0", | |||
There was a problem hiding this comment.
Not released yet, hence this build failing on Travis. Won't merge until it's released of course.
… -J-XX:..., evaluate env vars in rp-start wrapper when running on DC/OS
| # to the value of $HOST | ||
|
|
||
| if [ "$RP_PLATFORM" = mesos ]; then | ||
| ENDPOINT_SUFFIXES="HOST,PORT,BIND_HOST,BIND_PORT" |
There was a problem hiding this comment.
Alternatively, we could have the CLI provide (ENDPOINT_SUFFIXES). Perhaps less coupled, slightly more complex.
No description provided.