forgot port and -d wrapper

Issue: IS-44

18 files changed, 54 insertions, 18 deletions

diff --git a/salt/openbook/admin_api_server/files/Dockerfile b/salt/openbook/admin_api_server/files/Dockerfile
index 67e6832..91a6d93 100644
--- a/salt/openbook/admin_api_server/files/Dockerfile
+++ b/salt/openbook/admin_api_server/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 8083 5701 5702
+EXPOSE 5005 8083 5701 5702
 VOLUME {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}
 VOLUME {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}
 VOLUME /etc/ssl/certs
diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh
index 5242b29..e36f2dc 100644
--- a/salt/openbook/admin_api_server/files/run.sh
+++ b/salt/openbook/admin_api_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} ${@}
+docker run -d --rm --net=host -p 5005:5005 -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} ${@}
 exit 0
diff --git a/salt/openbook/admin_api_server/files/start_app.sh b/salt/openbook/admin_api_server/files/start_app.sh
index 6929935..a39709c 100644
--- a/salt/openbook/admin_api_server/files/start_app.sh
+++ b/salt/openbook/admin_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["admin_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
diff --git a/salt/openbook/admin_web_ui/files/Dockerfile b/salt/openbook/admin_web_ui/files/Dockerfile
index 80cb7a9..2a6f3e7 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 <carlos.konstanski@verizonwireless.com>
 ADD docker-start.tar.xz /
-EXPOSE 8082 5701 5702
+EXPOSE 5005 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 012776e..ced5058 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 {% 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 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"] }} ${@}
 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 49d7dad..99dc95a 100644
--- a/salt/openbook/admin_web_ui/files/start_app.sh
+++ b/salt/openbook/admin_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["admin_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
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 <carlos.konstanski@verizonwireless.com>
 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
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
diff --git a/salt/openbook/job_scheduler_server/files/Dockerfile b/salt/openbook/job_scheduler_server/files/Dockerfile
index 5490c21..17a1211 100644
--- a/salt/openbook/job_scheduler_server/files/Dockerfile
+++ b/salt/openbook/job_scheduler_server/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 5701 5702
+EXPOSE 5005 5701 5702
 VOLUME {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}
 VOLUME {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}
 RUN /installdeps.sh
diff --git a/salt/openbook/job_scheduler_server/files/run.sh b/salt/openbook/job_scheduler_server/files/run.sh
index 5fe972d..ef5edb5 100644
--- a/salt/openbook/job_scheduler_server/files/run.sh
+++ b/salt/openbook/job_scheduler_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} ${@}
+docker run -d --rm --net=host -p 5005:5005 -p 5701:5701 -p 5702:5702 -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} ${@}
 exit 0
diff --git a/salt/openbook/job_scheduler_server/files/start_app.sh b/salt/openbook/job_scheduler_server/files/start_app.sh
index c3bd78a..c5059d9 100644
--- a/salt/openbook/job_scheduler_server/files/start_app.sh
+++ b/salt/openbook/job_scheduler_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["job_scheduler_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
diff --git a/salt/openbook/workflow_server/files/Dockerfile b/salt/openbook/workflow_server/files/Dockerfile
index 8109934..5669f6b 100644
--- a/salt/openbook/workflow_server/files/Dockerfile
+++ b/salt/openbook/workflow_server/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 5701 5702
+EXPOSE 5005 5701 5702
 VOLUME {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}
 VOLUME {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}
 RUN /installdeps.sh
diff --git a/salt/openbook/workflow_server/files/run.sh b/salt/openbook/workflow_server/files/run.sh
index 5f8b5e8..a2eb8bf 100644
--- a/salt/openbook/workflow_server/files/run.sh
+++ b/salt/openbook/workflow_server/files/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }} ${@}
+docker run -d --rm --net=host -p 5005:5005 -p 5701:5701 -p 5702:5702 -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }} ${@}
 exit 0
diff --git a/salt/openbook/workflow_server/files/start_app.sh b/salt/openbook/workflow_server/files/start_app.sh
index de499a9..78d8301 100644
--- a/salt/openbook/workflow_server/files/start_app.sh
+++ b/salt/openbook/workflow_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["workflow_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