diff options
| -rwxr-xr-x | build-docker-containers.sh | 32 | ||||
| -rw-r--r-- | salt/openbook/ci/files/openbookctl | 10 |
2 files changed, 26 insertions, 16 deletions
diff --git a/build-docker-containers.sh b/build-docker-containers.sh index 5627f32..50df7e0 100755 --- a/build-docker-containers.sh +++ b/build-docker-containers.sh @@ -2,20 +2,20 @@ buildroot="$(pwd)" -# clean docker containers -if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then - sudo ${buildroot}/docker_build/ci/openbookctl stop -fi -for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do - sudo docker stop $i -done -for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do - sudo docker stop $i -done -sudo docker container prune -f -for i in $(sudo docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do - sudo docker rmi --force $i -done +# # clean docker containers +# if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then +# sudo ${buildroot}/docker_build/ci/openbookctl stop +# fi +# for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do +# sudo docker stop $i +# done +# for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do +# sudo docker stop $i +# done +# sudo docker container prune -f +# for i in $(sudo docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do +# sudo docker rmi --force $i +# done # clean the build files rm -rf ${HOME}/openbook-v4-installer @@ -27,8 +27,8 @@ cp ${HOME}/config.yaml /srv/bootstrap/ # run salt to create build scripts sudo /srv/bootstrap/run_salt.sh -# build new docker containers -sudo /root/openbook_build/ci/build.sh +# # build new docker containers +# sudo /root/openbook_build/ci/build.sh # refresh openbook-v4-installer repo (ansible playbook) pushd ${HOME} diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index 0a6aac8..96eb30a 100644 --- a/salt/openbook/ci/files/openbookctl +++ b/salt/openbook/ci/files/openbookctl @@ -4,6 +4,7 @@ echo 'mysql root password: {% raw %}{{ openbook_database_password }}{% endraw %} echo 'wsrep_node_address: {% raw %}{{ ansible_default_ipv4.address }}{% endraw %}' echo 'wsrep_cluster_address: gcomm://{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}' +{% raw %}{% if openbook_install_database == "True" %}{% endraw %} wait_for_database() { echo "Waiting for database to start..." started=1 @@ -26,13 +27,16 @@ ensure_openbook_databases_created() { mysql -h 127.0.0.1 -u root --password='{% raw %}{{ openbook_database_password }}{% endraw %}' &>/dev/null < {{ pillar["database"]["files"]["create_openbook_schemas"]["path"] }}/{{ pillar["database"]["files"]["create_openbook_schemas"]["name"] }} fi } +{% raw %}{% endif %}{% endraw %} do_start() { +{% raw %}{% if openbook_install_database == "True" %}{% endraw %} chmod 777 {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }} chmod 777 {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }} {{ pillar["ansible"]["dirs"]["output"]["name"] }}/database/run.sh wait_for_database ensure_openbook_databases_created +{% raw %}{% endif %}{% endraw %} {{ pillar["ansible"]["dirs"]["output"]["name"] }}/job_scheduler_server/run.sh {{ pillar["ansible"]["dirs"]["output"]["name"] }}/workflow_server/run.sh {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_api_server/run.sh @@ -62,7 +66,9 @@ do_stop() { docker stop {{ pillar["admin_api_server"]["container_name"] }} docker stop {{ pillar["workflow_server"]["container_name"] }} docker stop {{ pillar["job_scheduler_server"]["container_name"] }} +{% raw %}{% if openbook_install_database == "True" %}{% endraw %} docker stop {{ pillar["database"]["container_name"] }} +{% raw %}{% endif %}{% endraw %} docker container prune -f } @@ -70,7 +76,9 @@ do_help() { echo "Usage:" echo " $0 start" echo " $0 stop" +{% raw %}{% if openbook_install_database == "True" %}{% endraw %} echo " $0 test_database" +{% raw %}{% endif %}{% endraw %} } case $1 in @@ -80,10 +88,12 @@ case $1 in stop*) do_stop ;; +{% raw %}{% if openbook_install_database == "True" %}{% endraw %} test_database*) wait_for_database echo "Database is up." ;; +{% raw %}{% endif %}{% endraw %} *) do_help ;; |