Added support to pass in parameters to java containers

Issue: IS-44

18 files changed, 18 insertions, 12 deletions

diff --git a/salt/openbook/admin_api_server/files/Dockerfile b/salt/openbook/admin_api_server/files/Dockerfile
index 7f4125a..67e6832 100644
--- a/salt/openbook/admin_api_server/files/Dockerfile
+++ b/salt/openbook/admin_api_server/files/Dockerfile
@@ -8,3 +8,4 @@ VOLUME /etc/ssl/certs
 VOLUME /etc/ssl/private
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
+CMD []
diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh
index b98d6cc..5242b29 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 {% 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 9ebfc47..6929935 100644
--- a/salt/openbook/admin_api_server/files/start_app.sh
+++ b/salt/openbook/admin_api_server/files/start_app.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 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 ${@} -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 d302881..80cb7a9 100644
--- a/salt/openbook/admin_web_ui/files/Dockerfile
+++ b/salt/openbook/admin_web_ui/files/Dockerfile
@@ -8,3 +8,4 @@ VOLUME /etc/ssl/certs
 VOLUME /etc/ssl/private
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
+CMD []
diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh
index 90c4256..012776e 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 {% 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 a96ea87..49d7dad 100644
--- a/salt/openbook/admin_web_ui/files/start_app.sh
+++ b/salt/openbook/admin_web_ui/files/start_app.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 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 ${@} -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 9b58100..2584580 100644
--- a/salt/openbook/customer_api_server/files/Dockerfile
+++ b/salt/openbook/customer_api_server/files/Dockerfile
@@ -8,3 +8,4 @@ VOLUME /etc/ssl/certs
 VOLUME /etc/ssl/private
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
+CMD []
diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh
index 7199918..3c2d311 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 {% 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 e18cbe3..d2fe5c6 100644
--- a/salt/openbook/customer_api_server/files/start_app.sh
+++ b/salt/openbook/customer_api_server/files/start_app.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 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 ${@} -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 47c4435..24f37d2 100644
--- a/salt/openbook/customer_web_ui/files/Dockerfile
+++ b/salt/openbook/customer_web_ui/files/Dockerfile
@@ -8,3 +8,4 @@ VOLUME /etc/ssl/certs
 VOLUME /etc/ssl/private
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
+CMD []
diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh
index 988a95a..e5330d1 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 {% 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 ff75879..d469592 100644
--- a/salt/openbook/customer_web_ui/files/start_app.sh
+++ b/salt/openbook/customer_web_ui/files/start_app.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 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 ${@} -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 6d7b63f..5490c21 100644
--- a/salt/openbook/job_scheduler_server/files/Dockerfile
+++ b/salt/openbook/job_scheduler_server/files/Dockerfile
@@ -6,3 +6,4 @@ VOLUME {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_ser
 VOLUME {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
+CMD []
diff --git a/salt/openbook/job_scheduler_server/files/run.sh b/salt/openbook/job_scheduler_server/files/run.sh
index 764c832..5fe972d 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 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 87dc22a..c3bd78a 100644
--- a/salt/openbook/job_scheduler_server/files/start_app.sh
+++ b/salt/openbook/job_scheduler_server/files/start_app.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 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 ${@} -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 6008269..8109934 100644
--- a/salt/openbook/workflow_server/files/Dockerfile
+++ b/salt/openbook/workflow_server/files/Dockerfile
@@ -6,3 +6,4 @@ VOLUME {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["nam
 VOLUME {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}
 RUN /installdeps.sh
 ENTRYPOINT [ "/start_app.sh" ]
+CMD []
diff --git a/salt/openbook/workflow_server/files/run.sh b/salt/openbook/workflow_server/files/run.sh
index fd7e4c4..5f8b5e8 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 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 5a865ff..de499a9 100644
--- a/salt/openbook/workflow_server/files/start_app.sh
+++ b/salt/openbook/workflow_server/files/start_app.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 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 ${@} -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster