dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix buildscripts to wait for Docker and build snapshots

Browse Source
This commit is contained in:
Nanne Baars 2018-08-08 18:23:27 +02:00
parent 1252e3dc21
commit bca8b3c650
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build-all.sh
View File

@ -13,15 +13,17 @@ if [[ "${SUCCESS}" -eq 00 ]] ; then
fi fi
#mvn clean install mvn clean install
#if [[ "$?" -ne 0 ]] ; then if [[ "$?" -ne 0 ]] ; then
# exit y$? exit y$?
#fi fi
cd - cd -
sh build_docker.sh sh build_docker.sh
if [[ "$?" -ne 0 ]] ; then
exit y$?
fi
echo "Do you want to run docker-compose?"
while true; do while true; do
read -p "Do you want to run docker-compose?" yn read -p "Do you want to run docker-compose?" yn
case ${yn} in case ${yn} in
@ -29,4 +31,4 @@ while true; do
[Nn]* ) exit;; [Nn]* ) exit;;
* ) echo "Please answer yes or no.";; * ) echo "Please answer yes or no.";;
esac esac
done done

4
scripts/build_docker.sh
View File

@ -3,8 +3,8 @@
WEBGOAT_HOME=$(pwd)/../ WEBGOAT_HOME=$(pwd)/../
cd ${WEBGOAT_HOME}/webgoat-server cd ${WEBGOAT_HOME}/webgoat-server
docker build -t webgoat/webgoat-8.0 . docker build -t webgoat/webgoat-v8.0.0.snapshot .
cd ${WEBGOAT_HOME}/webwolf cd ${WEBGOAT_HOME}/webwolf
docker build -t webgoat/webwolf . docker build -t webgoat/webwolf-v8.0.0.snapshot .

2
scripts/clean-run-docker-compose.sh
View File

@ -2,4 +2,4 @@
cd .. cd ..
docker-compose rm -f docker-compose rm -f
docker-compose up docker-compose -f docker-compose-local.yml up