diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-27 12:49:13 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-27 12:49:13 -0700 |
| commit | 9754a4fd93e6cd9e159bbba568c722ae15baebcc (patch) | |
| tree | fc42a22ce50427623fc0ee268601ddf4a75cdd3b /salt/openbook/admin_api_server | |
| parent | c259610af157e155cb0330544afe04df2632c29d (diff) | |
Openbook CI: add SSL cert configurability
Issue: IS-33
Diffstat (limited to 'salt/openbook/admin_api_server')
| -rw-r--r-- | salt/openbook/admin_api_server/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/admin_api_server/files/run.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/salt/openbook/admin_api_server/files/Dockerfile b/salt/openbook/admin_api_server/files/Dockerfile index f6d22ba..7f4125a 100644 --- a/salt/openbook/admin_api_server/files/Dockerfile +++ b/salt/openbook/admin_api_server/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8083 5701 5702 VOLUME {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} VOLUME {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh index a09c30d..b98d6cc 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"] }} --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 |