diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-07 15:14:14 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-07 15:14:14 -0700 |
| commit | 39457637f12e596f160caac62c235b3c8dfdc0b0 (patch) | |
| tree | db97d343fc084a9e0a8ec15191c45c5932d72b34 /salt/openbook/workflow_server/files | |
| parent | 501a985cf66a2fb8949c151f86d18f0ac7ed946a (diff) | |
Added support to pass in parameters to java containers
Issue: IS-44
Diffstat (limited to 'salt/openbook/workflow_server/files')
| -rw-r--r-- | salt/openbook/workflow_server/files/Dockerfile | 1 | ||||
| -rw-r--r-- | salt/openbook/workflow_server/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/workflow_server/files/start_app.sh | 2 |
3 files changed, 3 insertions, 2 deletions
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 |