From 82a4e72b03b61fcde7244ba199d834cea9849138 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Sat, 10 Mar 2018 12:53:30 -0700 Subject: Choose the correct docker containers to pull at runtime Issue: IS-80 --- salt/openbook/workflow_server/files/start_app.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'salt/openbook/workflow_server/files/start_app.sh') diff --git a/salt/openbook/workflow_server/files/start_app.sh b/salt/openbook/workflow_server/files/start_app.sh index 4ba6b98..7dab42e 100644 --- a/salt/openbook/workflow_server/files/start_app.sh +++ b/salt/openbook/workflow_server/files/start_app.sh @@ -1,10 +1,9 @@ #!/bin/bash +args="-Djava.awt.headless=true -Xmx256m -XX:+UseConcMarkSweepGC -Djsse.enableSNIExtension=false -Djava.security.egd=file:/dev/urandom" if [ "${1}" == "debug" ]; then - args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001" -else - args="" + args="${args} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001" fi -jar=$(find -maxdepth 1 -type f -name '{{ pillar["workflow_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +jar=$(find -maxdepth 1 -type f -name '{{ pillar["workflow_server"]["jar_name"] }}-{{ pillar["workflow_server"]["branch"] }}*' | awk -F/ '{print $2}') exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster -- cgit v1.3