BB: remove Docker volumes.

3 files changed, 2 insertions, 39 deletions

diff --git a/buildbot/bootstrap-scripts/bootstrap-walletbuilder b/buildbot/bootstrap-scripts/bootstrap-walletbuilder
deleted file mode 100755
index 8a5304c..0000000
--- a/buildbot/bootstrap-scripts/bootstrap-walletbuilder
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Bootstrap the Taler setup for the user account that
-# is currently logged in.
-
-# Generates a setup for a single user,
-# including a postgresql DB.
-
-set -eu
-
-BRANCH=master
-REPOS="wallet-core"
-
-cd $HOME
-
-for component in $REPOS; do
-  if ! test -d $HOME/$component; then
-    git clone git://localhost/$component.git
-  fi
-done
-
-for component in $REPOS; do
-  echo "Checking out $component to $BRANCH"
-  git -C $HOME/$component checkout $BRANCH
-done
-
-if test ! -d worker ; then
-  buildbot-worker create-worker --umask=0o22 ~/worker localhost:9989 wallet-worker wallet-pass
-fi
-
-
-mkdir -p ~/.config/systemd/user/
-cp systemd-services/buildbot-worker-wallet.service ~/.config/systemd/user/
-
-systemctl --user daemon-reload || echo "Please use 'machinectl shell walletbuilder@.host' to log in to use this script"
-
-systemctl --user enable buildbot-worker-wallet.service
-systemctl --user start buildbot-worker-wallet.service
diff --git a/buildbot/build.sh b/buildbot/build.sh
index cdb8ea1..ac1129e 100755
--- a/buildbot/build.sh
+++ b/buildbot/build.sh
@@ -7,7 +7,7 @@ echo "Building the Docker base image (taler_local/taler_base)."
 # URLs and secrets.  Not automatically generated.
 export TALER_DEPLOYMENT_CONFIG=${HOME}/deployment.conf
 export DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/docker.sock
-echo Remove data from previous builds
+echo "Remove data from previous builds.  Volumes will be removed before restarting."
 docker system prune -a
 
 ${HOME}/deployment/docker/demo/build_base.sh \
diff --git a/buildbot/restart.sh b/buildbot/restart.sh
index 3dc588f..10f1496 100755
--- a/buildbot/restart.sh
+++ b/buildbot/restart.sh
@@ -7,4 +7,5 @@ cd ${HOME}/deployment/docker/demo
 export DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/docker.sock
 export TALER_DEPLOYMENT_CONFIG=${HOME}/deployment.conf
 docker-compose stop
+docker-compose down -v
 docker-compose up --remove-orphans -d