From 6566b6759c4c23e797c6bc55f1463f16db145678 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 8 Dec 2017 08:19:45 -0700 Subject: Give each component a different debugging port. Issue: IS-44 --- salt/openbook/admin_web_ui/files/Dockerfile | 2 +- salt/openbook/admin_web_ui/files/run.sh | 2 +- salt/openbook/admin_web_ui/files/start_app.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'salt/openbook/admin_web_ui') diff --git a/salt/openbook/admin_web_ui/files/Dockerfile b/salt/openbook/admin_web_ui/files/Dockerfile index 2a6f3e7..4132f08 100644 --- a/salt/openbook/admin_web_ui/files/Dockerfile +++ b/salt/openbook/admin_web_ui/files/Dockerfile @@ -1,7 +1,7 @@ FROM {{ pillar["registry"]["url"] }}/openbook_baseimage:latest MAINTAINER Carlos Konstanski ADD docker-start.tar.xz / -EXPOSE 5005 8082 5701 5702 +EXPOSE 5004 8082 5701 5702 VOLUME {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} VOLUME {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} VOLUME /etc/ssl/certs diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh index ced5058..706dc28 100644 --- a/salt/openbook/admin_web_ui/files/run.sh +++ b/salt/openbook/admin_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5005:5005 -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} ${@} +docker run -d --rm --net=host -p 5004:5004 -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} ${@} exit 0 diff --git a/salt/openbook/admin_web_ui/files/start_app.sh b/salt/openbook/admin_web_ui/files/start_app.sh index 13b8676..9c4e929 100644 --- a/salt/openbook/admin_web_ui/files/start_app.sh +++ b/salt/openbook/admin_web_ui/files/start_app.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ "${1}" == "debug" ]; then - args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005" + args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5004" else args="" fi -- cgit v1.3