diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-28 14:17:35 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-28 14:17:35 -0700 |
| commit | ee05c6885f8688c101a186690f716250d7aca657 (patch) | |
| tree | cf29d6237ff6455471c1804ed14d45fadf2f7cf0 /salt/openbook/customer_api_server/files | |
| parent | 184f021a36226f3b0c8dc7f85e440692808f02f8 (diff) | |
syncing up with vzw
Diffstat (limited to 'salt/openbook/customer_api_server/files')
| -rw-r--r-- | salt/openbook/customer_api_server/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/customer_api_server/files/customer_api_server.json | 6 | ||||
| -rw-r--r-- | salt/openbook/customer_api_server/files/run.sh | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/salt/openbook/customer_api_server/files/Dockerfile b/salt/openbook/customer_api_server/files/Dockerfile index d80916f..9b58100 100644 --- a/salt/openbook/customer_api_server/files/Dockerfile +++ b/salt/openbook/customer_api_server/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8081 5701 5702 VOLUME {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} VOLUME {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json index 7704b40..767fa97 100644 --- a/salt/openbook/customer_api_server/files/customer_api_server.json +++ b/salt/openbook/customer_api_server/files/customer_api_server.json @@ -16,6 +16,10 @@ ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs" ,"application.port": {{ openbook_customer_api_server_port }} ,"cluster.interfaces": ["{{ ansible_default_ipv4.address }}"] - {% endif %} +{% endif %} +{% if openbook_ssl_cert and openbook_ssl_key %} + ,"ssl.cert.path": "{{ openbook_ssl_cert }}" + ,"ssl.key.path": "{{ openbook_ssl_key }}" +{% endif %} {% endraw %} } diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh index 7a5cbc4..7199918 100644 --- a/salt/openbook/customer_api_server/files/run.sh +++ b/salt/openbook/customer_api_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} exit 0 |