diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 13:29:15 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 13:29:15 -0600 |
| commit | fdad42526a91cb4f23da3174d6d685f5ce670bef (patch) | |
| tree | 406f3378690e7328a337418ad5db91787e90c8c2 | |
| parent | f12be95ef2cf31e4d95b76d604319880a15e04ad (diff) | |
making database container optional
| -rwxr-xr-x | build-docker-containers.sh | 32 | ||||
| -rw-r--r-- | salt/openbook/ci/files/openbookctl | 2 |
2 files changed, 17 insertions, 17 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 a12fa80..27c4974 100644 --- a/salt/openbook/ci/files/openbookctl +++ b/salt/openbook/ci/files/openbookctl @@ -66,7 +66,7 @@ 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 is True %}{% endraw %} +{% raw %}{% if openbook_install_database is defined %}{% endraw %} docker stop {{ pillar["database"]["container_name"] }} {% raw %}{% endif %}{% endraw %} docker container prune -f |