From 26d16aa954571cc8b0c479580e58b9ac67185a97 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 7 Dec 2018 18:45:40 +0900 Subject: [PATCH 1/4] expose btcqbo --- docker-compose-generator/docker-fragments/opt-add-btcqbo.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml index 7c00ec4..a47b5cc 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml @@ -27,6 +27,8 @@ services: - "6379" volumes: - "redis_datadir:/data" - + btcpayserver: + environment: + BTCPAY_EXTERNALSERVICES: "Quickbooks Online Connector:btcqbo;" volumes: redis_datadir: \ No newline at end of file From fac158d7909b358ec79d30d32fa43f7b2927abab Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 7 Dec 2018 19:41:46 +0900 Subject: [PATCH 2/4] bump, advertize quickbook plugin --- contrib/build-all-images.sh | 46 +++++++++---------- .../docker-fragments/btcpayserver.yml | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ffc69d5..71cf7c7 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -71,16 +71,16 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -echo "Building btcpayserver/lnd:v0.5-beta-3" +echo "Building btcpayserver/lnd:v0.5.1-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.5-beta-3 +git checkout basedon-v0.5.1-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5-beta-3" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5.1-beta" . cd - && cd .. @@ -113,16 +113,16 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.24/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.26/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.24/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.26/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -echo "Building btcpayserver/btcpayserver:1.0.3.24" +echo "Building btcpayserver/btcpayserver:1.0.3.26" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.0.3.24 +git checkout v1.0.3.26 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.24" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.26" . cd - && cd .. @@ -191,16 +191,16 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5-beta-3/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -echo "Building btcpayserver/lnd:v0.5-beta-3" +echo "Building btcpayserver/lnd:v0.5.1-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.5-beta-3 +git checkout basedon-v0.5.1-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5-beta-3" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.5.1-beta" . cd - && cd .. @@ -283,26 +283,26 @@ cd - && cd .. # Build btcqbo -# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.1/Dockerfile +# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.8/Dockerfile DOCKERFILE="Dockerfile" -echo "Building jvandrew/btcqbo:0.1.1" +echo "Building jvandrew/btcqbo:0.1.8" git clone https://github.com/JeffVandrewJr/btcqbo btcqbo cd btcqbo -git checkout v0.1.1 +git checkout v0.1.8 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.1" . +docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.8" . cd - && cd .. # Build btcqbo -# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.1/Dockerfile +# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.1.8/Dockerfile DOCKERFILE="Dockerfile" -echo "Building jvandrew/btcqbo:0.1.1" +echo "Building jvandrew/btcqbo:0.1.8" git clone https://github.com/JeffVandrewJr/btcqbo btcqbo cd btcqbo -git checkout v0.1.1 +git checkout v0.1.8 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.1" . +docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.1.8" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 59790ce..04495dd 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.25} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.26} expose: - "49392" environment: From b93aa22c6eb4ec214c792d42bc8015e9502b13d3 Mon Sep 17 00:00:00 2001 From: Jeff Vandrew Jr <43861226+JeffVandrewJr@users.noreply.github.com> Date: Sun, 9 Dec 2018 14:44:05 -0500 Subject: [PATCH 3/4] update to newest version of BTCQBO (see below) This updates the repo to v0.1.20 of BTCQBO, which has the following improvements: 1. Better user experience. Flow through the sync/setup steps is more natural for the user. 2. Added email functionality. The QBO API does not allow issuance of receipts for invoice payments not made through Intuit's own payments module. The plugin now works around this issue by sending its own email receipts to customers when they pay an invoice. --- .../docker-fragments/opt-add-btcqbo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml index a47b5cc..dbd363f 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml @@ -2,7 +2,7 @@ version: "3" services: btcqbo: - image: jvandrew/btcqbo:0.1.8 + image: jvandrew/btcqbo:0.1.20 environment: REDIS_URL: "redis://redis:6379/0" BTCPAY_HOST: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST} @@ -12,7 +12,7 @@ services: links: - redis rq-worker: - image: jvandrew/btcqbo:0.1.8 + image: jvandrew/btcqbo:0.1.20 entrypoint: /usr/local/bin/rq command: worker -u redis://redis:6379/0 btcqbo environment: @@ -31,4 +31,4 @@ services: environment: BTCPAY_EXTERNALSERVICES: "Quickbooks Online Connector:btcqbo;" volumes: - redis_datadir: \ No newline at end of file + redis_datadir: From f120a968b1d1a83f1483a98d4b6dea371deda5bd Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 10 Dec 2018 17:03:18 +0900 Subject: [PATCH 4/4] Generation invoice macaroon in right folder --- docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 1 + docker-compose-generator/docker-fragments/litecoin-lnd.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 529e788..04a4c5a 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -20,6 +20,7 @@ services: externalip=${BTCPAY_HOST}:9735 alias=${LIGHTNING_ALIAS} adminmacaroonpath=/data/admin.macaroon + invoicemacaroonpath=/data/invoice.macaroon noseedbackup=1 notls=1 ports: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml index 621138a..dc949a3 100644 --- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml @@ -18,6 +18,7 @@ services: externalip=${BTCPAY_HOST}:9736 alias=${LIGHTNING_ALIAS} adminmacaroonpath=/data/admin.macaroon + invoicemacaroonpath=/data/invoice.macaroon noseedbackup=1 notls=1 ports: