commit 23d7beb2af2eab2f2b754e0c8ee10a1ccce84d27
parent 67d9da432e4db99ca7c388613ce8b7c6401429a8
Author: MS <ms@taler.net>
Date: Fri, 18 Nov 2022 15:04:34 +0100
BB: remove Docker volumes.
Diffstat:
3 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/buildbot/bootstrap-scripts/bootstrap-walletbuilder b/buildbot/bootstrap-scripts/bootstrap-walletbuilder
@@ -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
@@ -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
@@ -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