Merge pull request #1137 from martinstuder/dcos_support

SingularityService configuration & DC/OS support
HubSpot · Aug 24, 2016 · eba6b92 · eba6b92
2 parents bdf1b38 + 1e94125
commit eba6b92
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/Docs/images/dcos/singularity_large.png b/Docs/images/dcos/singularity_large.png
diff --git a/Docs/images/dcos/singularity_medium.png b/Docs/images/dcos/singularity_medium.png
diff --git a/Docs/images/dcos/singularity_small.png b/Docs/images/dcos/singularity_small.png
diff --git a/SingularityService/src/main/docker/start.sh b/SingularityService/src/main/docker/start.sh
@@ -13,7 +13,12 @@ fi
 
 args+=( -Xmx${SINGULARITY_MAX_HEAP:-512m} )
 args+=( -Djava.net.preferIPv4Stack=true )
+args+=( -Ddw.server.applicationContextPath="${SINGULARITY_APP_CTX:=/singularity}" )
 args+=( -Ddw.mesos.master="${SINGULARITY_MESOS_MASTER:=zk://localhost:2181/mesos}" )
+args+=( -Ddw.mesos.frameworkName="${SINGULARITY_MESOS_FRAMEWORK_NAME:=Singularity}" )
+args+=( -Ddw.mesos.frameworkId="${SINGULARITY_MESOS_FRAMEWORK_ID:=Singularity}" )
+args+=( -Ddw.mesos.defaultCpus="${SINGULARITY_MESOS_DEFAULT_CPUS:=1}" )
+args+=( -Ddw.mesos.defaultMemory="${SINGULARITY_MESOS_DEFAULT_MEMORY:=128}" )
 args+=( -Ddw.zookeeper.quorum="${SINGULARITY_ZK:=localhost:2181}" )
 args+=( -Ddw.zookeeper.zkNamespace="${SINGULARITY_ZK_NAMESPACE:=singularity}" )
 args+=( -Ddw.ui.baseUrl="${SINGULARITY_UI_BASE:=/singularity}" )