aljaz/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver-docker.git synced 2025-12-17 09:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gracefully fail if build.sh fail

Browse Source
This commit is contained in:
nicolas.dorier
2019-11-07 22:31:51 +09:00
parent ec7bca1991
commit 7360cec929
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
btcpay-setup.sh
View File

@@ -450,7 +450,12 @@ if $HAS_DOCKER; then
fi fi
# Generate the docker compose in BTCPAY_DOCKER_COMPOSE # Generate the docker compose in BTCPAY_DOCKER_COMPOSE
$HAS_DOCKER && . ./build.sh if $HAS_DOCKER; then
if ! ./build.sh; then
echo "Failed to generate the docker-compose"
return
fi
fi
if [[ "$BTCPAYGEN_OLD_PREGEN" == "true" ]]; then if [[ "$BTCPAYGEN_OLD_PREGEN" == "true" ]]; then
cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE

9
btcpay-update.sh
View File

@@ -38,9 +38,12 @@ if ! [ -f "/etc/docker/daemon.json" ] && [ -w "/etc/docker" ]; then
}" > /etc/docker/daemon.json }" > /etc/docker/daemon.json
echo "Setting limited log files in /etc/docker/daemon.json" echo "Setting limited log files in /etc/docker/daemon.json"
fi fi
set -e
. ./build.sh if ! ./build.sh; then
set +e echo "Failed to generate the docker-compose"
exit 1
fi
if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then if [ "$BTCPAYGEN_OLD_PREGEN" == "true" ]; then
cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE cp Generated/docker-compose.generated.yml $BTCPAY_DOCKER_COMPOSE
cp Generated/torrc.tmpl "$(dirname "$BTCPAY_DOCKER_COMPOSE")/torrc.tmpl" cp Generated/torrc.tmpl "$(dirname "$BTCPAY_DOCKER_COMPOSE")/torrc.tmpl"