diff options
| -rw-r--r-- | salt/openbook/job_scheduler_server/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/job_scheduler_server/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/workflow_server/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/workflow_server/files/run.sh | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/salt/openbook/job_scheduler_server/files/Dockerfile b/salt/openbook/job_scheduler_server/files/Dockerfile index 5f8a53e..6d7b63f 100644 --- a/salt/openbook/job_scheduler_server/files/Dockerfile +++ b/salt/openbook/job_scheduler_server/files/Dockerfile @@ -4,7 +4,5 @@ ADD docker-start.tar.xz / EXPOSE 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"] }} -VOLUME /etc/ssl/certs -VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/job_scheduler_server/files/run.sh b/salt/openbook/job_scheduler_server/files/run.sh index 4ed66b4..764c832 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"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --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/workflow_server/files/Dockerfile b/salt/openbook/workflow_server/files/Dockerfile index f4a9ce9..6008269 100644 --- a/salt/openbook/workflow_server/files/Dockerfile +++ b/salt/openbook/workflow_server/files/Dockerfile @@ -4,7 +4,5 @@ ADD docker-start.tar.xz / EXPOSE 5701 5702 VOLUME {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} VOLUME {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} -VOLUME /etc/ssl/certs -VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/workflow_server/files/run.sh b/salt/openbook/workflow_server/files/run.sh index 4b16052..fd7e4c4 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"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --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 |