Browse Source
Gracefully fail if build.sh fail
feature/lndseedbackup
nicolas.dorier
5 years ago
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
2 changed files with
12 additions and
4 deletions
-
btcpay-setup.sh
-
btcpay-update.sh
|
|
@ -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 |
|
|
|
|
|
@ -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" |
|
|
|
