From 00d19b6118deecb0cb83827e5a233f72b5453064 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Tue, 14 Nov 2017 22:40:07 +0000 Subject: autocommit Tue Nov 14 22:40:07 UTC 2017 --- playbooks/openbook.yaml | 12 ++++++------ templates/admin_api_server/run.sh | 2 +- templates/admin_web_ui/run.sh | 2 +- templates/ci/openbookctl | 12 ++++++------ templates/customer_api_server/run.sh | 2 +- templates/customer_web_ui/run.sh | 2 +- templates/job_scheduler_server/run.sh | 2 +- templates/workflow_server/run.sh | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/playbooks/openbook.yaml b/playbooks/openbook.yaml index b758b74..3b5f70b 100644 --- a/playbooks/openbook.yaml +++ b/playbooks/openbook.yaml @@ -185,22 +185,22 @@ docker pull "{{ openbook_docker_registry_url }}/openbook_database" fi if [ "{{ openbook_install_job_scheduler_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_job_scheduler_server_develop" + docker pull "{{ openbook_docker_registry_url }}/openbook_job_scheduler_server_unstable" fi if [ "{{ openbook_install_workflow_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_workflow_server_develop" + docker pull "{{ openbook_docker_registry_url }}/openbook_workflow_server_unstable" fi if [ "{{ openbook_install_admin_api_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_admin_api_server_develop" + docker pull "{{ openbook_docker_registry_url }}/openbook_admin_api_server_unstable" fi if [ "{{ openbook_install_customer_api_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_customer_api_server_develop" + docker pull "{{ openbook_docker_registry_url }}/openbook_customer_api_server_unstable" fi if [ "{{ openbook_install_admin_web_ui|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_admin_web_ui_develop" + docker pull "{{ openbook_docker_registry_url }}/openbook_admin_web_ui_unstable" fi if [ "{{ openbook_install_customer_web_ui|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_customer_web_ui_develop" + docker pull "{{ openbook_docker_registry_url }}/openbook_customer_web_ui_unstable" fi args: executable: /bin/bash diff --git a/templates/admin_api_server/run.sh b/templates/admin_api_server/run.sh index cd163db..2e014b0 100755 --- a/templates/admin_api_server/run.sh +++ b/templates/admin_api_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_admin_api_server_port }}:8083 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-api-server:/etc/openbook/admin-api-server -v /var/log/openbook/admin-api-server:/var/log/openbook/admin-api-server --name admin_api_server_develop docker-registry.pippiandcarlos.com/openbook_admin_api_server_develop +docker run -d --rm --net=host -p {{ openbook_admin_api_server_port }}:8083 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-api-server:/etc/openbook/admin-api-server -v /var/log/openbook/admin-api-server:/var/log/openbook/admin-api-server --name admin_api_server_unstable docker-registry.pippiandcarlos.com/openbook_admin_api_server_unstable exit 0 diff --git a/templates/admin_web_ui/run.sh b/templates/admin_web_ui/run.sh index 7220470..c7de25b 100755 --- a/templates/admin_web_ui/run.sh +++ b/templates/admin_web_ui/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_admin_web_ui_port }}:8082 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-web-ui:/etc/openbook/admin-web-ui -v /var/log/openbook/admin-web-ui:/var/log/openbook/admin-web-ui --name admin_web_ui_develop docker-registry.pippiandcarlos.com/openbook_admin_web_ui_develop +docker run -d --rm --net=host -p {{ openbook_admin_web_ui_port }}:8082 -p 5701:5701 -p 5702:5702 -v /etc/openbook/admin-web-ui:/etc/openbook/admin-web-ui -v /var/log/openbook/admin-web-ui:/var/log/openbook/admin-web-ui --name admin_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_admin_web_ui_unstable exit 0 diff --git a/templates/ci/openbookctl b/templates/ci/openbookctl index dda8ee4..0563a16 100755 --- a/templates/ci/openbookctl +++ b/templates/ci/openbookctl @@ -61,22 +61,22 @@ do_start() { do_stop() { {% if "True" == openbook_install_customer_web_ui|string() %} - docker stop customer_web_ui_develop + docker stop customer_web_ui_unstable {% endif %} {% if "True" == openbook_install_admin_web_ui|string() %} - docker stop admin_web_ui_develop + docker stop admin_web_ui_unstable {% endif %} {% if "True" == openbook_install_customer_api_server|string() %} - docker stop customer_api_server_develop + docker stop customer_api_server_unstable {% endif %} {% if "True" == openbook_install_admin_api_server|string() %} - docker stop admin_api_server_develop + docker stop admin_api_server_unstable {% endif %} {% if "True" == openbook_install_workflow_server|string() %} - docker stop workflow_server_develop + docker stop workflow_server_unstable {% endif %} {% if "True" == openbook_install_job_scheduler_server|string() %} - docker stop job_scheduler_server_develop + docker stop job_scheduler_server_unstable {% endif %} {% if "True" == openbook_install_database|string() %} docker stop database diff --git a/templates/customer_api_server/run.sh b/templates/customer_api_server/run.sh index 85a67a6..2884e62 100755 --- a/templates/customer_api_server/run.sh +++ b/templates/customer_api_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_customer_api_server_port }}:8081 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-api-server:/etc/openbook/customer-api-server -v /var/log/openbook/customer-api-server:/var/log/openbook/customer-api-server --name customer_api_server_develop docker-registry.pippiandcarlos.com/openbook_customer_api_server_develop +docker run -d --rm --net=host -p {{ openbook_customer_api_server_port }}:8081 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-api-server:/etc/openbook/customer-api-server -v /var/log/openbook/customer-api-server:/var/log/openbook/customer-api-server --name customer_api_server_unstable docker-registry.pippiandcarlos.com/openbook_customer_api_server_unstable exit 0 diff --git a/templates/customer_web_ui/run.sh b/templates/customer_web_ui/run.sh index ed6b38c..3016f56 100755 --- a/templates/customer_web_ui/run.sh +++ b/templates/customer_web_ui/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p {{ openbook_customer_web_ui_port }}:8080 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-web-ui:/etc/openbook/customer-web-ui -v /var/log/openbook/customer-web-ui:/var/log/openbook/customer-web-ui --name customer_web_ui_develop docker-registry.pippiandcarlos.com/openbook_customer_web_ui_develop +docker run -d --rm --net=host -p {{ openbook_customer_web_ui_port }}:8080 -p 5701:5701 -p 5702:5702 -v /etc/openbook/customer-web-ui:/etc/openbook/customer-web-ui -v /var/log/openbook/customer-web-ui:/var/log/openbook/customer-web-ui --name customer_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_customer_web_ui_unstable exit 0 diff --git a/templates/job_scheduler_server/run.sh b/templates/job_scheduler_server/run.sh index 9affda9..e8276e1 100755 --- a/templates/job_scheduler_server/run.sh +++ b/templates/job_scheduler_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/job-scheduler-server:/etc/openbook/job-scheduler-server -v /var/log/openbook/job-scheduler-server:/var/log/openbook/job-scheduler-server --name job_scheduler_server_develop docker-registry.pippiandcarlos.com/openbook_job_scheduler_server_develop +docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/job-scheduler-server:/etc/openbook/job-scheduler-server -v /var/log/openbook/job-scheduler-server:/var/log/openbook/job-scheduler-server --name job_scheduler_server_unstable docker-registry.pippiandcarlos.com/openbook_job_scheduler_server_unstable exit 0 diff --git a/templates/workflow_server/run.sh b/templates/workflow_server/run.sh index 9f5dc29..c471480 100755 --- a/templates/workflow_server/run.sh +++ b/templates/workflow_server/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/workflow-server:/etc/openbook/workflow-server -v /var/log/openbook/workflow-server:/var/log/openbook/workflow-server --name workflow_server_develop docker-registry.pippiandcarlos.com/openbook_workflow_server_develop +docker run -d --rm --net=host -p 5701:5701 -p 5702:5702 -v /etc/openbook/workflow-server:/etc/openbook/workflow-server -v /var/log/openbook/workflow-server:/var/log/openbook/workflow-server --name workflow_server_unstable docker-registry.pippiandcarlos.com/openbook_workflow_server_unstable exit 0 -- cgit v1.3