Retropex/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/Retropex/btcpayserver-docker.git synced 2025-05-13 05:20:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure that if build.sh fail, it returns

Browse Source
This commit is contained in:
nicolas.dorier 2019-11-07 22:21:00 +09:00
parent ff146ac8c8
commit ec7bca1991
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
btcpay-update.sh
View File

@ -38,8 +38,9 @@ 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 . ./build.sh
set +e
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"

2
build.sh
View File

@ -30,7 +30,7 @@ docker run -v "$(pwd)/Generated:/app/Generated" \
-e "BTCPAYGEN_LIGHTNING=$BTCPAYGEN_LIGHTNING" \ -e "BTCPAYGEN_LIGHTNING=$BTCPAYGEN_LIGHTNING" \
-e "BTCPAYGEN_SUBNAME=$BTCPAYGEN_SUBNAME" \ -e "BTCPAYGEN_SUBNAME=$BTCPAYGEN_SUBNAME" \
-e "BTCPAY_HOST_SSHAUTHORIZEDKEYS=$BTCPAY_HOST_SSHAUTHORIZEDKEYS" \ -e "BTCPAY_HOST_SSHAUTHORIZEDKEYS=$BTCPAY_HOST_SSHAUTHORIZEDKEYS" \
--rm $BTCPAYGEN_DOCKER_IMAGE || echo "Building the fragment failed" --rm $BTCPAYGEN_DOCKER_IMAGE
if [ "$BTCPAYGEN_REVERSEPROXY" == "nginx" ]; then if [ "$BTCPAYGEN_REVERSEPROXY" == "nginx" ]; then
cp Production/nginx.tmpl Generated/nginx.tmpl cp Production/nginx.tmpl Generated/nginx.tmpl