From 98012380d10075ed7fc4710db215b3f3ebd46669 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Wed, 30 Aug 2017 13:32:37 -0600 Subject: moved sudo into ci-script.sh --- ci-script.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ci-script.sh b/ci-script.sh index 517b5fe..42e4f40 100755 --- a/ci-script.sh +++ b/ci-script.sh @@ -4,29 +4,29 @@ buildroot="$(pwd)" # clean docker containers if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then - ${buildroot}/docker_build/ci/openbookctl stop + sudo ${buildroot}/docker_build/ci/openbookctl stop fi -for i in $(docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do - docker stop $i +for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do + sudo docker stop $i done -for i in $(docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do - docker stop $i +for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do + sudo docker stop $i done -docker container prune -f -for i in $(docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do - docker rmi --force $i +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 ${buildroot}/openbook_build /etc/openbook /var/lib/mysql /var/log/mysql /var/log/openbook +sudo rm -rf ${buildroot}/openbook_build /etc/openbook /var/lib/mysql /var/log/mysql /var/log/openbook # configure salt cp ${HOME}/config.yaml /srv/bootstrap/ # run salt to create build scripts -/srv/bootstrap/run_salt.sh +sudo /srv/bootstrap/run_salt.sh # build new docker containers -openbook_build/ci/build.sh +sudo openbook_build/ci/build.sh exit 0 -- cgit v1.3