From f10c27eb9638204435ad08aed6df67b7236cbbd8 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Thu, 7 Dec 2017 15:47:38 -0700 Subject: forgot port and -d wrapper Issue: IS-44 --- salt/openbook/customer_api_server/files/Dockerfile | 2 +- salt/openbook/customer_api_server/files/run.sh | 2 +- salt/openbook/customer_api_server/files/start_app.sh | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'salt/openbook/customer_api_server') diff --git a/salt/openbook/customer_api_server/files/Dockerfile b/salt/openbook/customer_api_server/files/Dockerfile index 2584580..e861766 100644 --- a/salt/openbook/customer_api_server/files/Dockerfile +++ b/salt/openbook/customer_api_server/files/Dockerfile @@ -1,7 +1,7 @@ FROM {{ pillar["registry"]["url"] }}/openbook_baseimage:latest MAINTAINER Carlos Konstanski ADD docker-start.tar.xz / -EXPOSE 8081 5701 5702 +EXPOSE 5005 8081 5701 5702 VOLUME {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} VOLUME {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} VOLUME /etc/ssl/certs diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh index 3c2d311..d603f73 100644 --- a/salt/openbook/customer_api_server/files/run.sh +++ b/salt/openbook/customer_api_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} ${@} +docker run -d --rm --net=host -p 5005:5005 -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} ${@} exit 0 diff --git a/salt/openbook/customer_api_server/files/start_app.sh b/salt/openbook/customer_api_server/files/start_app.sh index d2fe5c6..c96e0bd 100644 --- a/salt/openbook/customer_api_server/files/start_app.sh +++ b/salt/openbook/customer_api_server/files/start_app.sh @@ -1,4 +1,10 @@ #!/bin/bash +if [ "${1}" == "-d" ]; then + args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" +else + args="" +fi + jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}') -exec java ${@} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster +exec java ${args} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster -- cgit v1.3