diff options
Diffstat (limited to 'salt/openbook/admin_api_server/files')
| -rw-r--r-- | salt/openbook/admin_api_server/files/Dockerfile | 1 | ||||
| -rw-r--r-- | salt/openbook/admin_api_server/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/admin_api_server/files/start_app.sh | 2 |
3 files changed, 3 insertions, 2 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 |