making database containers optional

1 files changed, 16 insertions, 16 deletions

diff --git a/build-docker-containers.sh b/build-docker-containers.sh
index 50df7e0..5627f32 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}