summaryrefslogtreecommitdiff
path: root/salt/openbook/customer_web_ui
diff options
context:
space:
mode:
Diffstat (limited to 'salt/openbook/customer_web_ui')
-rw-r--r--salt/openbook/customer_web_ui/files/Dockerfile1
-rw-r--r--salt/openbook/customer_web_ui/files/run.sh2
-rw-r--r--salt/openbook/customer_web_ui/files/start_app.sh2
3 files changed, 3 insertions, 2 deletions
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