diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-07 15:47:38 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-07 15:47:38 -0700 |
| commit | f10c27eb9638204435ad08aed6df67b7236cbbd8 (patch) | |
| tree | 2585656ca8728c3032b4385572efac705695a66d /salt/openbook/customer_web_ui | |
| parent | 39457637f12e596f160caac62c235b3c8dfdc0b0 (diff) | |
forgot port and -d wrapper
Issue: IS-44
Diffstat (limited to 'salt/openbook/customer_web_ui')
| -rw-r--r-- | salt/openbook/customer_web_ui/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/customer_web_ui/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/customer_web_ui/files/start_app.sh | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/salt/openbook/customer_web_ui/files/Dockerfile b/salt/openbook/customer_web_ui/files/Dockerfile index 24f37d2..d964f1d 100644 --- a/salt/openbook/customer_web_ui/files/Dockerfile +++ b/salt/openbook/customer_web_ui/files/Dockerfile @@ -1,7 +1,7 @@ FROM {{ pillar["registry"]["url"] }}/openbook_baseimage:latest MAINTAINER Carlos Konstanski <carlos.konstanski@verizonwireless.com> ADD docker-start.tar.xz / -EXPOSE 8080 5701 5702 +EXPOSE 5005 8080 5701 5702 VOLUME {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} VOLUME {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} VOLUME /etc/ssl/certs diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh index e5330d1..3dafb12 100644 --- a/salt/openbook/customer_web_ui/files/run.sh +++ b/salt/openbook/customer_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} ${@} +docker run -d --rm --net=host -p 5005:5005 -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} ${@} exit 0 diff --git a/salt/openbook/customer_web_ui/files/start_app.sh b/salt/openbook/customer_web_ui/files/start_app.sh index d469592..157ed30 100644 --- a/salt/openbook/customer_web_ui/files/start_app.sh +++ b/salt/openbook/customer_web_ui/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_web_ui"]["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 |