From da887a00e619fd6778b71d53ffdcb5cfe087f8d4 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 10 Dec 2018 23:42:51 +0900 Subject: [PATCH 1/4] bump --- docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 04495dd..5d15c4a 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -4,7 +4,7 @@ services: btcpayserver: restart: unless-stopped - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.26} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.28} expose: - "49392" environment: From 6a9e175674eb86d247d59ac9efc84aa464a7b230 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 10 Dec 2018 23:46:46 +0900 Subject: [PATCH 2/4] bump --- docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 2 +- docker-compose-generator/docker-fragments/litecoin-lnd.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 04a4c5a..9de0d2a 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -40,7 +40,7 @@ services: environment: BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true" BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon" - BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon" + BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;restrictedmacaroonfilepath=/etc/lnd_bitcoin/invoice.macaroon" volumes: - "lnd_bitcoin_datadir:/etc/lnd_bitcoin" links: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml index dc949a3..60f467b 100644 --- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml @@ -36,7 +36,7 @@ services: btcpayserver: environment: - BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;allowinsecure=true" + BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;restrictedmacaroonfilepath=/etc/lnd_litecoin/invoice.macaroon;allowinsecure=true" volumes: - "lnd_litecoin_datadir:/etc/lnd_litecoin" links: From bd6d077a26b1a08d6e3526ef95c7f030b329e98e Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 11 Dec 2018 00:26:28 +0900 Subject: [PATCH 3/4] Document opt-add-btcqbo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fac68e0..d3c6457 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-save-storage-xxs](docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml) will keep around 2 weeks of blocks (prune BTC for 5 GB) (lightning not supported) * [opt-lnd-autopilot](docker-compose-generator/docker-fragments/opt-lnd-autopilot.yml) will activate auto pilot on LND. (5 channels, 60% of allocation) * [opt-save-memory](docker-compose-generator/docker-fragments/opt-save-memory.yml) will decrease the default dbcache at the expense of longer synchronization time (Useful if your machine is less than 2GB) +* [opt-add-btcqbo](docker-compose-generator/docker-fragments/opt-add-btcqbo.yml) will allow you to create an invoice on Quickbooks which include a way for your customer to pay on BTCPay Server (More information on this [github repository](https://github.com/JeffVandrewJr/btcqbo/), this plugin is maintained by [JeffVandrewJr](https://github.com/JeffVandrewJr)) You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file). From 1a282f103a0e1dc35d03e436b95cad6f7ae66eb9 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 11 Dec 2018 23:39:07 +0900 Subject: [PATCH 4/4] Fix docker timeouts --- README.md | 6 +++--- btcpay-down.sh | 2 +- btcpay-restart.sh | 3 +-- btcpay-setup.sh | 10 +++++----- btcpay-up.sh | 2 +- btcpay-update.sh | 2 +- changedomain.sh | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d3c6457..8e4e906 100644 --- a/README.md +++ b/README.md @@ -244,9 +244,9 @@ Requires=docker.service network-online.target Type=oneshot RemainAfterExit=yes -ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd "$(dirname $BTCPAY_ENV_FILE)" && docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d' -ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd "$(dirname $BTCPAY_ENV_FILE)" && docker-compose -f "$BTCPAY_DOCKER_COMPOSE" stop' -ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd "$(dirname $BTCPAY_ENV_FILE)" && docker-compose -f "$BTCPAY_DOCKER_COMPOSE" restart' +ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd "$(dirname $BTCPAY_ENV_FILE)" && docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d -t "${COMPOSE_HTTP_TIMEOUT:-180}"' +ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd "$(dirname $BTCPAY_ENV_FILE)" && docker-compose -f "$BTCPAY_DOCKER_COMPOSE" stop -t "${COMPOSE_HTTP_TIMEOUT:-180}"' +ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd "$(dirname $BTCPAY_ENV_FILE)" && docker-compose -f "$BTCPAY_DOCKER_COMPOSE" restart -t "${COMPOSE_HTTP_TIMEOUT:-180}"' [Install] WantedBy=multi-user.target diff --git a/btcpay-down.sh b/btcpay-down.sh index 75dde3e..0bfde1c 100755 --- a/btcpay-down.sh +++ b/btcpay-down.sh @@ -3,4 +3,4 @@ . /etc/profile.d/btcpay-env.sh cd "`dirname $BTCPAY_ENV_FILE`" -docker-compose -f $BTCPAY_DOCKER_COMPOSE down +docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t "${COMPOSE_HTTP_TIMEOUT:-180}" diff --git a/btcpay-restart.sh b/btcpay-restart.sh index 76e227c..914e7b6 100755 --- a/btcpay-restart.sh +++ b/btcpay-restart.sh @@ -3,5 +3,4 @@ . /etc/profile.d/btcpay-env.sh cd "`dirname $BTCPAY_ENV_FILE`" -docker-compose -f $BTCPAY_DOCKER_COMPOSE down -docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d +docker-compose -f $BTCPAY_DOCKER_COMPOSE restart -t "${COMPOSE_HTTP_TIMEOUT:-180}" diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 859cff6..0003034 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -288,9 +288,9 @@ Requires=docker.service network-online.target Type=oneshot RemainAfterExit=yes -ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d' -ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" stop' -ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart' +ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t \"\$COMPOSE_HTTP_TIMEOUT\"' +ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" stop -t \"\$COMPOSE_HTTP_TIMEOUT\"' +ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart -t \"\$COMPOSE_HTTP_TIMEOUT\"' [Install] WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service @@ -338,10 +338,10 @@ cd "$(dirname $BTCPAY_ENV_FILE)" if [ ! -z "$OLD_BTCPAY_DOCKER_COMPOSE" ] && [ "$OLD_BTCPAY_DOCKER_COMPOSE" != "$BTCPAY_DOCKER_COMPOSE" ]; then echo "Closing old docker-compose at $OLD_BTCPAY_DOCKER_COMPOSE..." - docker-compose -f "$OLD_BTCPAY_DOCKER_COMPOSE" down + docker-compose -f "$OLD_BTCPAY_DOCKER_COMPOSE" down -t "${COMPOSE_HTTP_TIMEOUT:-180}" fi -docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans +docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans -t "${COMPOSE_HTTP_TIMEOUT:-180}" # Give SSH key to BTCPay if [[ -f "$BTCPAY_HOST_SSHKEYFILE" ]]; then diff --git a/btcpay-up.sh b/btcpay-up.sh index 4a799ca..e3cf950 100755 --- a/btcpay-up.sh +++ b/btcpay-up.sh @@ -3,4 +3,4 @@ . /etc/profile.d/btcpay-env.sh cd "`dirname $BTCPAY_ENV_FILE`" -docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d +docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t "${COMPOSE_HTTP_TIMEOUT:-180}" diff --git a/btcpay-update.sh b/btcpay-update.sh index 56db6be..82cbcdd 100755 --- a/btcpay-update.sh +++ b/btcpay-update.sh @@ -49,4 +49,4 @@ for scriptname in *.sh; do done cd "`dirname $BTCPAY_ENV_FILE`" -docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d --remove-orphans +docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d --remove-orphans -t "${COMPOSE_HTTP_TIMEOUT:-180}" diff --git a/changedomain.sh b/changedomain.sh index adde316..d4cdb83 100755 --- a/changedomain.sh +++ b/changedomain.sh @@ -20,5 +20,5 @@ echo "BTCPAY_HOST=$BTCPAY_HOST" >> "$BTCPAY_ENV_FILE" echo "ACME_CA_URI=$ACME_CA_URI" >> "$BTCPAY_ENV_FILE" cd "`dirname $BTCPAY_ENV_FILE`" -docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d +docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d -t "${COMPOSE_HTTP_TIMEOUT:-180}" fi