From 9754a4fd93e6cd9e159bbba568c722ae15baebcc Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Mon, 27 Nov 2017 12:49:13 -0700 Subject: Openbook CI: add SSL cert configurability Issue: IS-33 --- salt/openbook/admin_api_server/files/Dockerfile | 2 ++ salt/openbook/admin_api_server/files/run.sh | 2 +- salt/openbook/admin_web_ui/files/Dockerfile | 2 ++ salt/openbook/admin_web_ui/files/run.sh | 2 +- salt/openbook/customer_api_server/files/Dockerfile | 2 ++ salt/openbook/customer_api_server/files/run.sh | 2 +- salt/openbook/customer_web_ui/files/Dockerfile | 2 ++ salt/openbook/customer_web_ui/files/run.sh | 2 +- salt/openbook/job_scheduler_server/files/Dockerfile | 2 ++ salt/openbook/job_scheduler_server/files/run.sh | 2 +- salt/openbook/workflow_server/files/Dockerfile | 2 ++ salt/openbook/workflow_server/files/run.sh | 2 +- 12 files changed, 18 insertions(+), 6 deletions(-) (limited to 'salt') 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 diff --git a/salt/openbook/admin_web_ui/files/Dockerfile b/salt/openbook/admin_web_ui/files/Dockerfile index 5bd87ad..d302881 100644 --- a/salt/openbook/admin_web_ui/files/Dockerfile +++ b/salt/openbook/admin_web_ui/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8082 5701 5702 VOLUME {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} VOLUME {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh index a563ada..90c4256 100644 --- a/salt/openbook/admin_web_ui/files/run.sh +++ b/salt/openbook/admin_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} exit 0 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/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 diff --git a/salt/openbook/customer_web_ui/files/Dockerfile b/salt/openbook/customer_web_ui/files/Dockerfile index 9a44a6c..47c4435 100644 --- a/salt/openbook/customer_web_ui/files/Dockerfile +++ b/salt/openbook/customer_web_ui/files/Dockerfile @@ -4,5 +4,7 @@ ADD docker-start.tar.xz / EXPOSE 8080 5701 5702 VOLUME {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} VOLUME {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} +VOLUME /etc/ssl/certs +VOLUME /etc/ssl/private RUN /installdeps.sh ENTRYPOINT [ "/start_app.sh" ] diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh index abb01bd..988a95a 100644 --- a/salt/openbook/customer_web_ui/files/run.sh +++ b/salt/openbook/customer_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} +docker run -d --rm --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} exit 0 diff --git a/salt/openbook/job_scheduler_server/files/Dockerfile b/salt/openbook/job_scheduler_server/files/Dockerfile index 6d7b63f..5f8a53e 100644 --- a/salt/openbook/job_scheduler_server/files/Dockerfile +++ b/salt/openbook/job_scheduler_server/files/Dockerfile @@ -4,5 +4,7 @@ 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 764c832..4ed66b4 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"] }} --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"] }} -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"] }} exit 0 diff --git a/salt/openbook/workflow_server/files/Dockerfile b/salt/openbook/workflow_server/files/Dockerfile index 6008269..f4a9ce9 100644 --- a/salt/openbook/workflow_server/files/Dockerfile +++ b/salt/openbook/workflow_server/files/Dockerfile @@ -4,5 +4,7 @@ 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 fd7e4c4..4b16052 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"] }} -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"] }} exit 0 -- cgit v1.3