diff options
| -rw-r--r-- | playbooks/openbook.yaml | 12 | ||||
| -rwxr-xr-x | templates/admin_api_server/run.sh | 2 | ||||
| -rwxr-xr-x | templates/admin_web_ui/run.sh | 2 | ||||
| -rwxr-xr-x | templates/ci/openbookctl | 12 | ||||
| -rwxr-xr-x | templates/customer_api_server/run.sh | 2 | ||||
| -rwxr-xr-x | templates/customer_web_ui/run.sh | 2 | ||||
| -rwxr-xr-x | templates/job_scheduler_server/run.sh | 2 | ||||
| -rwxr-xr-x | templates/workflow_server/run.sh | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/playbooks/openbook.yaml b/playbooks/openbook.yaml index 385efd5..eef1305 100644 --- a/playbooks/openbook.yaml +++ b/playbooks/openbook.yaml @@ -195,22 +195,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_unstable" + docker pull "{{ openbook_docker_registry_url }}/openbook_job_scheduler_server_develop" fi if [ "{{ openbook_install_workflow_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_workflow_server_unstable" + docker pull "{{ openbook_docker_registry_url }}/openbook_workflow_server_develop" fi if [ "{{ openbook_install_admin_api_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_admin_api_server_unstable" + docker pull "{{ openbook_docker_registry_url }}/openbook_admin_api_server_develop" fi if [ "{{ openbook_install_customer_api_server|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_customer_api_server_unstable" + docker pull "{{ openbook_docker_registry_url }}/openbook_customer_api_server_develop" fi if [ "{{ openbook_install_admin_web_ui|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_admin_web_ui_unstable" + docker pull "{{ openbook_docker_registry_url }}/openbook_admin_web_ui_develop" fi if [ "{{ openbook_install_customer_web_ui|string() }}" == "True" ]; then - docker pull "{{ openbook_docker_registry_url }}/openbook_customer_web_ui_unstable" + docker pull "{{ openbook_docker_registry_url }}/openbook_customer_web_ui_develop" fi args: executable: /bin/bash diff --git a/templates/admin_api_server/run.sh b/templates/admin_api_server/run.sh index a01845a..0e0ecf5 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 5002:5002 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name admin_api_server_unstable docker-registry.pippiandcarlos.com/openbook_admin_api_server_unstable ${@} +docker run -d --rm --net=host -p 5002:5002 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name admin_api_server_develop docker-registry.pippiandcarlos.com/openbook_admin_api_server_develop ${@} exit 0 diff --git a/templates/admin_web_ui/run.sh b/templates/admin_web_ui/run.sh index 2baf2d2..2343c30 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 5004:5004 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name admin_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_admin_web_ui_unstable ${@} +docker run -d --rm --net=host -p 5004:5004 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name admin_web_ui_develop docker-registry.pippiandcarlos.com/openbook_admin_web_ui_develop ${@} exit 0 diff --git a/templates/ci/openbookctl b/templates/ci/openbookctl index 8199d1e..cd205f0 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_unstable + docker stop customer_web_ui_develop {% endif %} {% if "True" == openbook_install_admin_web_ui|string() %} - docker stop admin_web_ui_unstable + docker stop admin_web_ui_develop {% endif %} {% if "True" == openbook_install_customer_api_server|string() %} - docker stop customer_api_server_unstable + docker stop customer_api_server_develop {% endif %} {% if "True" == openbook_install_admin_api_server|string() %} - docker stop admin_api_server_unstable + docker stop admin_api_server_develop {% endif %} {% if "True" == openbook_install_workflow_server|string() %} - docker stop workflow_server_unstable + docker stop workflow_server_develop {% endif %} {% if "True" == openbook_install_job_scheduler_server|string() %} - docker stop job_scheduler_server_unstable + docker stop job_scheduler_server_develop {% 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 e859d85..b3e2887 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 5003:5003 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name customer_api_server_unstable docker-registry.pippiandcarlos.com/openbook_customer_api_server_unstable ${@} +docker run -d --rm --net=host -p 5003:5003 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name customer_api_server_develop docker-registry.pippiandcarlos.com/openbook_customer_api_server_develop ${@} exit 0 diff --git a/templates/customer_web_ui/run.sh b/templates/customer_web_ui/run.sh index 9f16d08..6f03693 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 5005:5005 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name customer_web_ui_unstable docker-registry.pippiandcarlos.com/openbook_customer_web_ui_unstable ${@} +docker run -d --rm --net=host -p 5005:5005 -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 -v /etc/ssl/certs:/etc/ssl/certs -v /etc/ssl/private:/etc/ssl/private --name customer_web_ui_develop docker-registry.pippiandcarlos.com/openbook_customer_web_ui_develop ${@} exit 0 diff --git a/templates/job_scheduler_server/run.sh b/templates/job_scheduler_server/run.sh index ece8753..b87211f 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 5000:5000 -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 ${@} +docker run -d --rm --net=host -p 5000:5000 -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 ${@} exit 0 diff --git a/templates/workflow_server/run.sh b/templates/workflow_server/run.sh index ed89b05..776832a 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 5001:5001 -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 ${@} +docker run -d --rm --net=host -p 5001:5001 -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 ${@} exit 0 |