test: fix docker and apps

This commit is contained in:
Ethan Buchman
2017-03-05 20:39:52 -05:00
parent 0fa34f7f67
commit e4e70ece3f
4 changed files with 22 additions and 14 deletions

View File

@ -12,18 +12,25 @@ echo "* [$(date +"%T")] cleaning up $LOGS_DIR"
rm -rf "$LOGS_DIR"
mkdir -p "$LOGS_DIR"
set +e
echo
echo "* [$(date +"%T")] removing run_test container"
docker rm -vf run_test
set -e
set +u
if [[ "$CIRCLECI" == true ]]; then
set -u
echo
echo "* [$(date +"%T")] starting rsyslog container"
docker rm -f rsyslog || true
docker run -d -v "$LOGS_DIR:/var/log/" -p 127.0.0.1:5514:514/udp --name rsyslog voxxit/rsyslog
fi
echo
echo "* [$(date +"%T")] building docker image"
bash "$DIR/docker/build.sh"
if [[ "$SKIP_BUILD" == "" ]]; then
echo
echo "* [$(date +"%T")] building docker image"
bash "$DIR/docker/build.sh"
fi
echo
echo "* [$(date +"%T")] running go tests and app tests in docker container"