From 51b97527f637b38bd72ffd12a831b6885e05ed04 Mon Sep 17 00:00:00 2001 From: Mike Olthoff Date: Tue, 25 May 2021 21:13:02 -0700 Subject: [PATCH 001/134] update dogecoin (#483) --- docker-compose-generator/docker-fragments/dogecoin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/dogecoin.yml b/docker-compose-generator/docker-fragments/dogecoin.yml index e593a72b9..a1c408e25 100644 --- a/docker-compose-generator/docker-fragments/dogecoin.yml +++ b/docker-compose-generator/docker-fragments/dogecoin.yml @@ -4,7 +4,7 @@ services: dogecoind: restart: unless-stopped container_name: btcpayserver_dogecoind - image: btcpayserver/dogecoin:1.14.2 + image: btcpayserver/dogecoin:1.14.3 environment: DOGECOIN_EXTRA_ARGS: | rpcuser=ceiwHEbqWI83 From 4ff671f50f7d19f5f2114f5a428609a1404c2320 Mon Sep 17 00:00:00 2001 From: Anthony Potdevin <31413433+apotdevin@users.noreply.github.com> Date: Wed, 26 May 2021 06:13:29 +0200 Subject: [PATCH 002/134] chore: bump thunderhub (#479) --- .../docker-fragments/opt-add-thunderhub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml index f4012fdb5..65324a2ef 100644 --- a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml +++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml @@ -6,7 +6,7 @@ services: volumes: - "lnd_bitcoin_thub_datadir:/etc/lnd_bitcoin_thub_datadir" bitcoin_thub: - image: apotdevin/thunderhub:base-v0.12.16 + image: apotdevin/thunderhub:base-v0.12.17@sha256:a5f85ee15c5d8f31630c28c702a035b2b2a50b5ac2145eb1f6ce0e4c1c69bdc9 restart: unless-stopped stop_signal: SIGKILL environment: From ece80920ee120b1895b606127e241f953748574a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 26 May 2021 13:19:00 +0900 Subject: [PATCH 003/134] Update doc --- README.md | 9 ++--- contrib/DockerFileBuildHelper/Image.cs | 4 +++ contrib/DockerFileBuildHelper/Program.cs | 11 ++++++ contrib/build-all-images.sh | 46 ++++++++++++++++-------- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 1bebf1cdf..3f6f145a5 100644 --- a/README.md +++ b/README.md @@ -334,6 +334,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.12.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.1.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.51 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | @@ -352,7 +353,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | | dalijolijo/docker-bitcore | 0.90.9.1 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | | btcpayserver/dash | 0.16.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | -| btcpayserver/dogecoin | 1.14.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.2/Dogecoin/1.14.2/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | +| btcpayserver/dogecoin | 1.14.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | | groestlcoin/docker-groestlcoin | 2.21.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | | groestlcoin/lightning | v0.9.2 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | @@ -364,8 +365,8 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | | btcpayserver/monero | 0.17.2.0 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | -| redis | 6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396 | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | -| bluewalletorganization/lndhub | v1.3.3@sha256:b99408dfb53f503def405668f5fc4d8185de39a87843d4ea8774544a5df1fe36 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | +| redis | 6.2.2-buster | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | +| bluewalletorganization/lndhub | v1.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | shesek/bwt | 0.2.2-electrum | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm64v8.Dockerfile) | [Github](https://github.com/bwt-dev/bwt) - [DockerHub](https://hub.docker.com/r/shesek/bwt) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | @@ -373,7 +374,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.0.13 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.0.13/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.0.13/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| apotdevin/thunderhub | base-v0.12.16 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.16/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.16/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.16/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | +| apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | diff --git a/contrib/DockerFileBuildHelper/Image.cs b/contrib/DockerFileBuildHelper/Image.cs index 2814b1d20..ea6fc4103 100644 --- a/contrib/DockerFileBuildHelper/Image.cs +++ b/contrib/DockerFileBuildHelper/Image.cs @@ -38,6 +38,10 @@ public static Image Parse(string str) img.User = match.Groups[1].Length == 0 ? string.Empty : match.Groups[1].Value.Substring(0, match.Groups[1].Value.Length - 1); img.Name = match.Groups[2].Value; img.Tag = match.Groups[3].Value; + if (img.Tag.Contains('@')) + { + img.Tag = img.Tag.Split('@')[0]; + } if (img.Tag == string.Empty) img.Tag = "latest"; return img; diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 034470b4b..c51781c5e 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -380,6 +380,17 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.SupportedByUs = true; break; } + case "bitcointaprootcc/0.21.0-bip8-lottrue": + { + var tagNoRevision = image.Tag.Split('-').First(); + dockerInfo.DockerFilePath = $"bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"bitcointaprootcc/0.21.0-bip8-lottrue"; + dockerInfo.SupportedByUs = true; + break; + } case "elements": { var tagNoRevision = image.Tag.Split('-').First(); diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 645a6404b..9d4d9ab6d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -229,6 +229,22 @@ docker build -f "$DOCKERFILE" -t "chekaz/docker-bitcoinplus:2.7.0" . cd - && cd .. +# Build bitcointaprootcc/0.21.0-bip8-lottrue +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile +DOCKERFILE="bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue:latest" +git clone https://github.com/btcpayserver/dockerfile-deps bitcointaprootcc/0.21.0-bip8-lottrue +cd bitcointaprootcc/0.21.0-bip8-lottrue +git checkout bitcointaprootcc/0.21.0-bip8-lottrue +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue:latest" . +cd - && cd .. + + # Build docker-bitcore # https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile DOCKERFILE="docker-bitcored/Dockerfile" @@ -274,14 +290,14 @@ cd - && cd .. # Build dogecoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.2/Dogecoin/1.14.2/linuxamd64.Dockerfile -DOCKERFILE="Dogecoin/1.14.2/linuxamd64.Dockerfile" -echo "Building btcpayserver/dogecoin:1.14.2" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile +DOCKERFILE="Dogecoin/1.14.3/linuxamd64.Dockerfile" +echo "Building btcpayserver/dogecoin:1.14.3" git clone https://github.com/btcpayserver/dockerfile-deps dogecoin cd dogecoin -git checkout Dogecoin/1.14.2 +git checkout Dogecoin/1.14.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/dogecoin:1.14.2" . +docker build -f "$DOCKERFILE" -t "btcpayserver/dogecoin:1.14.3" . cd - && cd .. @@ -534,12 +550,12 @@ cd - && cd .. # Build redis # https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile DOCKERFILE="5.0/Dockerfile" -echo "Building redis:6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396" +echo "Building redis:6.2.2-buster" git clone https://github.com/docker-library/redis redis cd redis git checkout f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "redis:6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396" . +docker build -f "$DOCKERFILE" -t "redis:6.2.2-buster" . cd - && cd .. @@ -548,12 +564,12 @@ cd - && cd .. DOCKERFILE="Dockerfile" # https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" -echo "Building bluewalletorganization/lndhub:v1.3.3@sha256:b99408dfb53f503def405668f5fc4d8185de39a87843d4ea8774544a5df1fe36" +echo "Building bluewalletorganization/lndhub:v1.3.3" git clone https://github.com/BlueWallet/LndHub lndhub cd lndhub git checkout v1.3.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "bluewalletorganization/lndhub:v1.3.3@sha256:b99408dfb53f503def405668f5fc4d8185de39a87843d4ea8774544a5df1fe36" . +docker build -f "$DOCKERFILE" -t "bluewalletorganization/lndhub:v1.3.3" . cd - && cd .. @@ -744,18 +760,18 @@ cd - && cd .. # Build thunderhub -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.16/Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.16/arm32v7.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.16/arm64v8.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building apotdevin/thunderhub:base-v0.12.16" +echo "Building apotdevin/thunderhub:base-v0.12.17" git clone https://github.com/apotdevin/thunderhub thunderhub cd thunderhub -git checkout v0.12.16 +git checkout v0.12.17 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.12.16" . +docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.12.17" . cd - && cd .. From 72ca972f0b45d9c75e9233ca585b09e554e827ff Mon Sep 17 00:00:00 2001 From: gruve-p Date: Wed, 26 May 2021 06:27:59 +0200 Subject: [PATCH 004/134] Bump GRS Core and c-lightning (#484) * Bump GRS Core and c-lightning * Update eclair --- README.md | 6 ++--- contrib/build-all-images.sh | 24 +++++++++---------- .../groestlcoin-clightning.yml | 2 +- .../docker-fragments/groestlcoin-eclair.yml | 2 +- .../docker-fragments/groestlcoin.yml | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 3f6f145a5..dc17fcf79 100644 --- a/README.md +++ b/README.md @@ -355,11 +355,11 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/dash | 0.16.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | | btcpayserver/dogecoin | 1.14.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | -| groestlcoin/docker-groestlcoin | 2.21.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | -| groestlcoin/lightning | v0.9.2 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | +| groestlcoin/docker-groestlcoin | 2.21.1 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | +| groestlcoin/lightning | v0.10.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | | groestlcoin/groestlcoin-lightning-charge | version-0.4.22 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) | | groestlcoin/groestlcoin-spark | version-0.2.16 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) | -| groestlcoin/eclair | v0.3.3 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.3.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) | +| groestlcoin/eclair | v0.6.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) | | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) | | btcpayserver/elements | 0.18.1.11 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 9d4d9ab6d..381bb88ba 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -316,12 +316,12 @@ cd - && cd .. # Build lightning # https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile DOCKERFILE="Dockerfile" -echo "Building groestlcoin/lightning:v0.9.2" +echo "Building groestlcoin/lightning:v0.10.0" git clone https://github.com/Groestlcoin/lightning lightning cd lightning -git checkout v0.9.2 +git checkout v0.10.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.9.2" . +docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.10.0" . cd - && cd .. @@ -350,14 +350,14 @@ cd - && cd .. # Build eclair -# https://raw.githubusercontent.com/Groestlcoin/eclair/v0.3.3/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building groestlcoin/eclair:v0.3.3" +echo "Building groestlcoin/eclair:v0.6.0" git clone https://github.com/Groestlcoin/eclair eclair cd eclair -git checkout v0.3.3 +git checkout v0.6.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/eclair:v0.3.3" . +docker build -f "$DOCKERFILE" -t "groestlcoin/eclair:v0.6.0" . cd - && cd .. @@ -374,14 +374,14 @@ cd - && cd .. # Build docker-groestlcoin -# https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.0/Dockerfile -DOCKERFILE="groestlcoin/2.21.0/Dockerfile" -echo "Building groestlcoin/docker-groestlcoin:2.21.0" +# https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.1/Dockerfile +DOCKERFILE="groestlcoin/2.21.1/Dockerfile" +echo "Building groestlcoin/docker-groestlcoin:2.21.1" git clone https://github.com/Groestlcoin/docker-groestlcoin docker-groestlcoin cd docker-groestlcoin git checkout master cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.21.0" . +docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.21.1" . cd - && cd .. @@ -1009,5 +1009,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 52cd1fdc1..593c2796e 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v0.9.2 + image: groestlcoin/lightning:v0.10.0 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped diff --git a/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml b/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml index 961651351..702046aad 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml @@ -9,7 +9,7 @@ services: container_name: btcpayserver_eclair_groestlcoin restart: unless-stopped stop_signal: SIGINT - image: groestlcoin/eclair:v0.3.3 + image: groestlcoin/eclair:v0.6.0 environment: PUBLIC_HOST: ${BTCPAY_HOST} JAVA_OPTS: | diff --git a/docker-compose-generator/docker-fragments/groestlcoin.yml b/docker-compose-generator/docker-fragments/groestlcoin.yml index 11d4195ff..3f4ed3705 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin.yml @@ -4,7 +4,7 @@ services: groestlcoind: restart: unless-stopped container_name: btcpayserver_groestlcoind - image: groestlcoin/docker-groestlcoin:2.21.0 + image: groestlcoin/docker-groestlcoin:2.21.1 environment: GROESTLCOIN_EXTRA_ARGS: | rpcport=43782 From b05e633dbb24bfa2a08ce6efeb7906e996f9dc5a Mon Sep 17 00:00:00 2001 From: Dali <37987466+dalijolijo@users.noreply.github.com> Date: Wed, 26 May 2021 06:28:26 +0200 Subject: [PATCH 005/134] Update BitCore version to 0.90.9.10 (#474) Co-authored-by: dalijolijo --- README.md | 2 +- contrib/build-all-images.sh | 4 ++-- docker-compose-generator/docker-fragments/bitcore.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dc17fcf79..143eb2dd2 100644 --- a/README.md +++ b/README.md @@ -351,7 +351,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | -| dalijolijo/docker-bitcore | 0.90.9.1 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | +| dalijolijo/docker-bitcore | 0.90.9.10 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | | btcpayserver/dash | 0.16.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | | btcpayserver/dogecoin | 1.14.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 381bb88ba..2ef03bdea 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -248,12 +248,12 @@ cd - && cd .. # Build docker-bitcore # https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile DOCKERFILE="docker-bitcored/Dockerfile" -echo "Building dalijolijo/docker-bitcore:0.90.9.1" +echo "Building dalijolijo/docker-bitcore:0.90.9.10" git clone https://github.com/dalijolijo/btcpayserver-docker-bitcore docker-bitcore cd docker-bitcore git checkout master cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dalijolijo/docker-bitcore:0.90.9.1" . +docker build -f "$DOCKERFILE" -t "dalijolijo/docker-bitcore:0.90.9.10" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcore.yml b/docker-compose-generator/docker-fragments/bitcore.yml index 6fa436378..a526dfca0 100644 --- a/docker-compose-generator/docker-fragments/bitcore.yml +++ b/docker-compose-generator/docker-fragments/bitcore.yml @@ -4,7 +4,7 @@ services: bitcored: restart: unless-stopped container_name: btcpayserver_bitcored - image: dalijolijo/docker-bitcore:0.90.9.1 + image: dalijolijo/docker-bitcore:0.90.9.10 environment: BITCOIN_EXTRA_ARGS: | rpcport=43782 From 92d9d840bc7bd8a127569e9d593b315f5c96a451 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Wed, 26 May 2021 06:29:06 +0200 Subject: [PATCH 006/134] Separate default liquid prune to own fragment (#457) This allows users who dont want to prune their liquid node to exclude the pruning fragment. (allows rescanning for utxos) --- .../docker-fragments/liquid-default-prune.yml | 7 +++++++ docker-compose-generator/docker-fragments/liquid.yml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 docker-compose-generator/docker-fragments/liquid-default-prune.yml diff --git a/docker-compose-generator/docker-fragments/liquid-default-prune.yml b/docker-compose-generator/docker-fragments/liquid-default-prune.yml new file mode 100644 index 000000000..d65b2010f --- /dev/null +++ b/docker-compose-generator/docker-fragments/liquid-default-prune.yml @@ -0,0 +1,7 @@ +version: "3" + +services: + elementsd_liquid: + environment: + ELEMENTS_EXTRA_ARGS: | + prune=5000 diff --git a/docker-compose-generator/docker-fragments/liquid.yml b/docker-compose-generator/docker-fragments/liquid.yml index 686ca765e..e72a61c41 100644 --- a/docker-compose-generator/docker-fragments/liquid.yml +++ b/docker-compose-generator/docker-fragments/liquid.yml @@ -16,7 +16,6 @@ services: port=39388 whitelist=0.0.0.0/0 validatepegin=0 - prune=5000 fallbackfee=0.000001 expose: - "43782" @@ -40,3 +39,6 @@ services: volumes: elements_datadir: elements_wallet_datadir: + +recommended: + - "liquid-default-prune" \ No newline at end of file From 51b700209b20babecb1114216dfa1b9b65e0284d Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 26 May 2021 13:33:44 +0900 Subject: [PATCH 007/134] opt-*-memory supported by doge --- .../docker-fragments/opt-more-memory.yml | 6 +++++- .../docker-fragments/opt-save-memory.yml | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-more-memory.yml b/docker-compose-generator/docker-fragments/opt-more-memory.yml index 11078b55d..1345b9572 100644 --- a/docker-compose-generator/docker-fragments/opt-more-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-more-memory.yml @@ -1,5 +1,5 @@ version: "3" -# If your machine has moar than 1GB of memory dedicated for bitcoind, use this +# If your machine has more than 1GB of memory dedicated for bitcoind, use this services: bitcoind: @@ -10,6 +10,10 @@ services: environment: BITCOIN_EXTRA_ARGS: | dbcache=1024 + dogecoind: + environment: + DOGECOIN_EXTRA_ARGS: | + dbcache=1024 feathercoind: environment: BITCOIN_EXTRA_ARGS: | diff --git a/docker-compose-generator/docker-fragments/opt-save-memory.yml b/docker-compose-generator/docker-fragments/opt-save-memory.yml index 070c44353..66961d313 100644 --- a/docker-compose-generator/docker-fragments/opt-save-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-save-memory.yml @@ -16,6 +16,11 @@ services: BITCOIN_EXTRA_ARGS: | dbcache=50 maxmempool=50 + dogecoind: + environment: + DOGECOIN_EXTRA_ARGS: | + dbcache=50 + maxmempool=50 feathercoind: environment: BITCOIN_EXTRA_ARGS: | From aac6173d8130f65e7a0d32eeb6643ad92e6fdd5d Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Sat, 5 Jun 2021 13:03:05 +0200 Subject: [PATCH 008/134] Upgrade Sphinx Relay to v2.1.3 --- README.md | 2 +- contrib/build-all-images.sh | 10 +++++----- .../docker-fragments/opt-add-sphinxrelay.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 143eb2dd2..bda07baaa 100644 --- a/README.md +++ b/README.md @@ -372,7 +372,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | -| sphinxlightning/sphinx-relay | v2.0.13 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.0.13/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.0.13/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | +| sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2ef03bdea..e6048f7a9 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -730,16 +730,16 @@ cd - && cd .. # Build sphinx-relay -# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.0.13/Dockerfile +# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.0.13/Dockerfile +# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building sphinxlightning/sphinx-relay:v2.0.13" +echo "Building sphinxlightning/sphinx-relay:v2.1.3" git clone https://github.com/stakwork/sphinx-relay sphinx-relay cd sphinx-relay -git checkout v2.0.13 +git checkout v2.1.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.0.13" . +docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.1.3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml index 2228d454e..23b1b883d 100644 --- a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml @@ -9,7 +9,7 @@ services: expose: - "10009" sphinxrelay: - image: sphinxlightning/sphinx-relay:v2.0.13 + image: "sphinxlightning/sphinx-relay:v2.1.3@sha256:14b92d2376f12a0c9a1f8156b008795b1785983e9433b623c7cb8079f8c20b7f" user: "0:0" restart: unless-stopped expose: From 776fdbeeb131306d205d6cf7d3e577ca0cac9c0d Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 14 Jun 2021 12:09:13 +0200 Subject: [PATCH 009/134] S3 backup provider (#438) * Add S3 backup provider Allows upload to S3 * Update backup.sh * Update backup.sh Co-authored-by: britttttk <39231115+britttttk@users.noreply.github.com> * Update backup.sh Co-authored-by: britttttk <39231115+britttttk@users.noreply.github.com> --- backup.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/backup.sh b/backup.sh index aecc6732e..6c1bd22c0 100755 --- a/backup.sh +++ b/backup.sh @@ -19,14 +19,26 @@ fi case "$BACKUP_PROVIDER" in "Dropbox") if [ -z "$DROPBOX_TOKEN" ]; then - echo "Set DROPBOX_TOKEN environment variable and try again." + echo -e "\033[0;31mSet DROPBOX_TOKEN environment variable and try again.\033[0m" exit 1 fi ;; + "S3") + echo -e "\033[1;33mUsing S3 backup provider. Make sure you have ran 'aws configure' on your root user and configured an AMI with access to your bucket.\033[0m" + if [ -z "$S3_BUCKET" ]; then + echo -e "\033[0;31mSet S3_BUCKET environment variable and try again.\033[0m" + exit 1 + fi + + if [ -z "$S3_PATH" ]; then + echo -e "\033[1;33mUsing bucket root for backup, set S3_PATH if you want to backup into a specific folder (Make sure it ends with a trailing slash).\033[0m" + fi + ;; + "SCP") if [ -z "$SCP_TARGET" ]; then - echo "Set SCP_TARGET environment variable and try again." + echo -e "\033[0;31mSet SCP_TARGET environment variable and try again.\033[0m" exit 1 fi ;; @@ -81,7 +93,14 @@ case $BACKUP_PROVIDER in rm $backup_path ;; - "SCP") + "S3") + echo "Uploading to S3 …" + docker run --rm -v ~/.aws:/root/.aws -v $backup_path:/aws/$filename amazon/aws-cli s3 cp $filename s3://$S3_BUCKET/$S3_PATH + echo "Deleting local backup …" + rm $backup_path + ;; + +"SCP") echo "Uploading via SCP …" scp $backup_path $SCP_TARGET echo "Deleting local backup …" From 365e990740aaa0e65f194df71bfad88456bde844 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 15 Jun 2021 11:58:05 +0900 Subject: [PATCH 010/134] Update tor --- contrib/build-all-images.sh | 22 ++++++++++--------- .../docker-fragments/opt-add-tor.yml | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e6048f7a9..aa17c9a44 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -314,7 +314,7 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/lightning:v0.10.0" git clone https://github.com/Groestlcoin/lightning lightning @@ -808,18 +808,18 @@ cd - && cd .. # Build tor -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile -DOCKERFILE="Tor/0.4.4.7/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/tor:0.4.4.7" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxamd64.Dockerfile +DOCKERFILE="Tor/0.4.6.5/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/tor:0.4.6.5" git clone https://github.com/btcpayserver/dockerfile-deps tor cd tor -git checkout Tor/0.4.4.7 +git checkout Tor/0.4.6.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.4.7" . +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.6.5" . cd - && cd .. @@ -1009,3 +1009,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index d7db83d8f..91a7a385d 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -69,7 +69,7 @@ services: tor: restart: unless-stopped - image: btcpayserver/tor:0.4.4.7 + image: btcpayserver/tor:0.4.6.5 container_name: tor environment: TOR_PASSWORD: btcpayserver From a7701414d3ed8af4739ce301623ed8c0ac1b2145 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 15 Jun 2021 11:59:43 +0900 Subject: [PATCH 011/134] Revert "Update tor" This reverts commit 365e990740aaa0e65f194df71bfad88456bde844. --- contrib/build-all-images.sh | 22 +++++++++---------- .../docker-fragments/opt-add-tor.yml | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index aa17c9a44..e6048f7a9 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -314,7 +314,7 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/lightning:v0.10.0" git clone https://github.com/Groestlcoin/lightning lightning @@ -808,18 +808,18 @@ cd - && cd .. # Build tor -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxamd64.Dockerfile -DOCKERFILE="Tor/0.4.6.5/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/tor:0.4.6.5" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile +DOCKERFILE="Tor/0.4.4.7/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/tor:0.4.4.7" git clone https://github.com/btcpayserver/dockerfile-deps tor cd tor -git checkout Tor/0.4.6.5 +git checkout Tor/0.4.4.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.6.5" . +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.4.7" . cd - && cd .. @@ -1009,5 +1009,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index 91a7a385d..d7db83d8f 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -69,7 +69,7 @@ services: tor: restart: unless-stopped - image: btcpayserver/tor:0.4.6.5 + image: btcpayserver/tor:0.4.4.7 container_name: tor environment: TOR_PASSWORD: btcpayserver From 51d09765bd9dd10063e29732194e02d1abba80f3 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 15 Jun 2021 12:27:03 +0900 Subject: [PATCH 012/134] Revert "Revert "Update tor"" This reverts commit a7701414d3ed8af4739ce301623ed8c0ac1b2145. --- contrib/build-all-images.sh | 22 ++++++++++--------- .../docker-fragments/opt-add-tor.yml | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e6048f7a9..aa17c9a44 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -314,7 +314,7 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile DOCKERFILE="Dockerfile" echo "Building groestlcoin/lightning:v0.10.0" git clone https://github.com/Groestlcoin/lightning lightning @@ -808,18 +808,18 @@ cd - && cd .. # Build tor -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile -DOCKERFILE="Tor/0.4.4.7/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/tor:0.4.4.7" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxamd64.Dockerfile +DOCKERFILE="Tor/0.4.6.5/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.6.5/Tor/0.4.6.5/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.6.5/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/tor:0.4.6.5" git clone https://github.com/btcpayserver/dockerfile-deps tor cd tor -git checkout Tor/0.4.4.7 +git checkout Tor/0.4.6.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.4.7" . +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.6.5" . cd - && cd .. @@ -1009,3 +1009,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index d7db83d8f..91a7a385d 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -69,7 +69,7 @@ services: tor: restart: unless-stopped - image: btcpayserver/tor:0.4.4.7 + image: btcpayserver/tor:0.4.6.5 container_name: tor environment: TOR_PASSWORD: btcpayserver From 2cd474b809799b8a8f8c48270793213473874f66 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 12 Jul 2021 08:53:00 +0200 Subject: [PATCH 013/134] bump transmuter --- .../docker-fragments/opt-add-btctransmuter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml index cef7aebf9..34ed3d192 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml @@ -3,7 +3,7 @@ version: "3" services: btctransmuter: restart: unless-stopped - image: btcpayserver/btctransmuter:0.0.56 + image: btcpayserver/btctransmuter:0.0.57 container_name: btctransmuter environment: TRANSMUTER_Database: User ID=postgres;Host=postgres;Port=5432;Database=btctransmuter${NBITCOIN_NETWORK:-regtest} From 4b7fffe0c7365f2091009b1c30154a25a2833fa7 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 8 Jun 2021 17:19:31 +0200 Subject: [PATCH 014/134] Add Tallycoin Connect fragment --- Production/nginx.tmpl | 10 +++++++ README.md | 2 ++ contrib/build-all-images.sh | 16 +++++++++++ .../docker-fragments/opt-add-sphinxrelay.yml | 4 +-- .../opt-add-tallycoin-connect.yml | 28 +++++++++++++++++++ .../docker-fragments/opt-lnd-grpc.yml | 6 ++++ 6 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml create mode 100644 docker-compose-generator/docker-fragments/opt-lnd-grpc.yml diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 6645d0bb8..db5328746 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -112,6 +112,16 @@ proxy_set_header X-Forwarded-Proto $scheme; proxy_pass http://sphinxrelay:3300/; } + {{ end }} + + {{ if (eq $serviceName "tallycoin_connect") }} + location /tallycoin-connect/ { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://tallycoin_connect:8123/; + } {{ end }} {{ if (eq $serviceName "configurator") }} diff --git a/README.md b/README.md index bda07baaa..db94af6d3 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-bluewallet-lndhub](docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml) for [Bluewallet LNDHub](https://github.com/BlueWallet/LndHub) - Use non-custodial LND Lightning directly from your Bluewallet, and freely let others open accounts on your node. Fragment maintained by [maltokyo](https://github.com/maltokyo). * [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md)) * [opt-add-sphinxrelay](docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml) for [Sphinx Relay](https://github.com/stakwork/sphinx-relay). Maintained by [dennisreimann](https://github.com/dennisreimann). +* [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/djbooth007/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann). * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin). * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect. * [opt-add-zammad](docker-compose-generator/docker-fragments/opt-add-zammad.yml) for [Zammad](https://zammad.com/features), a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails @@ -374,6 +375,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | +| dennisreimann/tallycoin_connect | v1.0.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm64v8.Dockerfile) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index aa17c9a44..c5a325dab 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -743,6 +743,22 @@ docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.1.3" . cd - && cd .. +# Build tallycoin_connect +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" +echo "Building dennisreimann/tallycoin_connect:v1.0.0" +git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect +cd tallycoin_connect +git checkout v1.0.0 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.0.0" . +cd - && cd .. + + # Build python-teos # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile DOCKERFILE="docker/Dockerfile" diff --git a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml index 23b1b883d..935a1b0a8 100644 --- a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml @@ -5,9 +5,6 @@ services: BTCPAY_EXTERNALSERVICES: "Sphinx Relay:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/sphinxrelay/app;" volumes: - "sphinxrelay_datadir:/etc/sphinxrelay_datadir" - lnd_bitcoin: - expose: - - "10009" sphinxrelay: image: "sphinxlightning/sphinx-relay:v2.1.3@sha256:14b92d2376f12a0c9a1f8156b008795b1785983e9433b623c7cb8079f8c20b7f" user: "0:0" @@ -36,4 +33,5 @@ volumes: sphinxrelay_datadir: required: - "bitcoin-lnd" + - "opt-lnd-grpc" - "opt-lnd-keysend" diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml new file mode 100644 index 000000000..06f0ae2b8 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -0,0 +1,28 @@ +version: "3" +services: + btcpayserver: + environment: + BTCPAY_EXTERNALSERVICES: "Tallycoin Connect:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/;" + volumes: + - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" + tallycoin_connect: + image: "dennisreimann/tallycoin_connect:v1.0.0@sha256:266cb62da9c7f81f97b1068bf40ba7e967009e1ff70f706f5363dcb6297197e6" + restart: unless-stopped + expose: + - "8123" + volumes: + - "tallycoin_connect_datadir:/tallycoin_connect" + - "lnd_bitcoin_datadir:/tallycoin_connect/lnd:ro" + environment: + PUBLIC_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/ + TALLYCOIN_APIKEY: "${TALLYCOIN_APIKEY}" + LND_MACAROON_PATH: /tallycoin_connect/lnd/admin.macaroon + LND_TLSCERT_PATH: /tallycoin_connect/lnd/tls.cert + PORT: 8123 + links: + - lnd_bitcoin +volumes: + tallycoin_connect_datadir: +required: + - "bitcoin-lnd" + - "opt-lnd-grpc" diff --git a/docker-compose-generator/docker-fragments/opt-lnd-grpc.yml b/docker-compose-generator/docker-fragments/opt-lnd-grpc.yml new file mode 100644 index 000000000..0bec46503 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-lnd-grpc.yml @@ -0,0 +1,6 @@ +version: "3" + +services: + lnd_bitcoin: + expose: + - "10009" From b1b0fe8151613a9c2b66f64a04fe0a3177688146 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 9 Jun 2021 19:28:02 +0200 Subject: [PATCH 015/134] Update to latest tallycoin_connect version --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++-------- .../docker-fragments/opt-add-tallycoin-connect.yml | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index db94af6d3..19e337c0d 100644 --- a/README.md +++ b/README.md @@ -375,7 +375,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| dennisreimann/tallycoin_connect | v1.0.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm64v8.Dockerfile) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| dennisreimann/tallycoin_connect | v1.1.2 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c5a325dab..247c23620 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -744,18 +744,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/Dockerfile +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.0.0/arm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building dennisreimann/tallycoin_connect:v1.0.0" +echo "Building dennisreimann/tallycoin_connect:v1.1.2" git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.0.0 +git checkout v1.1.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.0.0" . +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.1.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml index 06f0ae2b8..ed915afee 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -6,7 +6,7 @@ services: volumes: - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" tallycoin_connect: - image: "dennisreimann/tallycoin_connect:v1.0.0@sha256:266cb62da9c7f81f97b1068bf40ba7e967009e1ff70f706f5363dcb6297197e6" + image: "dennisreimann/tallycoin_connect:v1.1.2@sha256:853caccbb1bc1ce2878396113ba8c1909ca66e48d5e61d2376b7a68c4f95365c" restart: unless-stopped expose: - "8123" From 4f9005fbce191bd80df9a9fd6f963dc26e1b26b1 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 7 Jul 2021 12:44:38 +0200 Subject: [PATCH 016/134] Finalize Tallycoin Connect integration --- README.md | 2 +- contrib/build-all-images.sh | 8 ++++---- .../docker-fragments/opt-add-tallycoin-connect.yml | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 19e337c0d..f45a5bf73 100644 --- a/README.md +++ b/README.md @@ -375,7 +375,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| dennisreimann/tallycoin_connect | v1.1.2 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| djbooth007/tallycoin_connect | v1.2.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 247c23620..cf805767c 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -744,14 +744,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.1.2/Dockerfile +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building dennisreimann/tallycoin_connect:v1.1.2" +echo "Building dennisreimann/tallycoin_connect:v1.2.0" git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.1.2 +git checkout v1.2.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.1.2" . +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.2.0" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml index ed915afee..daf4051e8 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -6,7 +6,7 @@ services: volumes: - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" tallycoin_connect: - image: "dennisreimann/tallycoin_connect:v1.1.2@sha256:853caccbb1bc1ce2878396113ba8c1909ca66e48d5e61d2376b7a68c4f95365c" + image: "dennisreimann/tallycoin_connect:v1.2.0@sha256:8f55332744d81507d275f61048da0952badfa9824e9759c52a3dfc048640a47b" restart: unless-stopped expose: - "8123" @@ -16,6 +16,7 @@ services: environment: PUBLIC_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/ TALLYCOIN_APIKEY: "${TALLYCOIN_APIKEY}" + TALLYCOIN_PASSWD: "${TALLYCOIN_PASSWD}" LND_MACAROON_PATH: /tallycoin_connect/lnd/admin.macaroon LND_TLSCERT_PATH: /tallycoin_connect/lnd/tls.cert PORT: 8123 From f027bc36ddb99819a8116dbcc769272365373297 Mon Sep 17 00:00:00 2001 From: Richard Safier Date: Mon, 7 Jun 2021 17:50:45 -0400 Subject: [PATCH 017/134] Add fragment to enable LND watchtower client --- .../docker-fragments/opt-lnd-wtclient.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml diff --git a/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml b/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml new file mode 100644 index 000000000..a00110d37 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml @@ -0,0 +1,7 @@ +version: "3" + +services: + lnd_bitcoin: + environment: + LND_EXTRA_ARGS: | + wtclient.active=1 From bff1bc4ab21ca9b5a50139f4921f78ea5de428ea Mon Sep 17 00:00:00 2001 From: Richard Safier Date: Tue, 8 Jun 2021 00:35:12 -0400 Subject: [PATCH 018/134] Add opt-lnd-wtclient fragment description in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f45a5bf73..3f882bec4 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,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-lnd-keysend](docker-compose-generator/docker-fragments/opt-lnd-keysend.yml) will activate keysend on LND. +* [opt-lnd-wtclient](docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml) will activate the watchtower client on LND. * [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-more-memory](docker-compose-generator/docker-fragments/opt-more-memory.yml) will increase the default dbcache to make synchronization faster (Useful if your machine is has around 4GB) * [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 add-on is maintained by [JeffVandrewJr](https://github.com/JeffVandrewJr), see more on [this video](https://www.youtube.com/watch?v=srgwL9ozg6c)) From e0bb3b82b0713b96df7ad0ae18643bcfe6d1ebbf Mon Sep 17 00:00:00 2001 From: Richard Safier Date: Tue, 8 Jun 2021 09:57:27 -0400 Subject: [PATCH 019/134] Add ability to customize watchtower sweep fee --- README.md | 4 ++-- .../docker-fragments/opt-lnd-wtclient.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f882bec4..a5229e9a3 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ Additionally, there are specific environment variables for some addons: * `WOOCOMMERCE_HOST`: If woocommerce is activated with [opt-add-woocommerce](docker-compose-generator/docker-fragments/opt-add-woocommerce.yml), the hostname of your woocommerce website (eg. `store.example.com`) * `EPS_XPUB`: If Electrum Personal Server (EPS) is activated with [opt-add-electrum-ps](docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml), you must set the Extended Public Key (XPUB, YPUB or ZPUB) of the wallet you want to use, before first run of the EPS server. If you accidently start EPS without this, it will not work properly as the model of EPS is to monitor only specified wallets. * If Bitcoin Wallet Tracker is activated with [opt-add-bwt](docker-compose-generator/docker-fragments/opt-add-bwt.yml), you can use `BWT_XPUB`/`BWT_XPUB_*` (to set your XPUB/YPUB/ZPUB), `BWT_DESCRIPTOR`/`BWT_DESCRIPTOR_*` (for script descriptors), `BWT_RESCAN_SINCE` (set to the wallet creation date in YYYY-MM-DD to speed up the rescan), `BWT_BITCOIND_WALLET` and `BWT_GAP_LIMIT`. - +* `LND_WTCLIENT_SWEEP_FEE`: If LND watchtower is activated with [opt-lnd-wtclient](docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml), you can use `LND_WTCLIENT_SWEEP_FEE` to change the sweep fee used in constructing the justice transaction (default is 10 sat/byte) # Tooling A wide variety of useful scripts are available once BTCPay is installed: @@ -157,7 +157,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-lnd-keysend](docker-compose-generator/docker-fragments/opt-lnd-keysend.yml) will activate keysend on LND. -* [opt-lnd-wtclient](docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml) will activate the watchtower client on LND. +* [opt-lnd-wtclient](docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml) will activate the watchtower client on LND. `LND_WTCLIENT_SWEEP_FEE` can be used to override the default 10 sat/byte justice transaction fee * [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-more-memory](docker-compose-generator/docker-fragments/opt-more-memory.yml) will increase the default dbcache to make synchronization faster (Useful if your machine is has around 4GB) * [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 add-on is maintained by [JeffVandrewJr](https://github.com/JeffVandrewJr), see more on [this video](https://www.youtube.com/watch?v=srgwL9ozg6c)) diff --git a/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml b/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml index a00110d37..5cfe9134a 100644 --- a/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml +++ b/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml @@ -5,3 +5,4 @@ services: environment: LND_EXTRA_ARGS: | wtclient.active=1 + wtclient.sweep-fee-rate="${LND_WTCLIENT_SWEEP_FEE:-10}" From b2c7a3e6ea80858171c2acfbffeb607823f137c2 Mon Sep 17 00:00:00 2001 From: Richard Safier Date: Tue, 8 Jun 2021 10:21:40 -0400 Subject: [PATCH 020/134] remove quotes from wtclient fragment --- docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml b/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml index 5cfe9134a..2c66c2a08 100644 --- a/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml +++ b/docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml @@ -5,4 +5,4 @@ services: environment: LND_EXTRA_ARGS: | wtclient.active=1 - wtclient.sweep-fee-rate="${LND_WTCLIENT_SWEEP_FEE:-10}" + wtclient.sweep-fee-rate=${LND_WTCLIENT_SWEEP_FEE:-10} From d60a4e64302dce5811d905818236749ca3639785 Mon Sep 17 00:00:00 2001 From: Richard Safier Date: Tue, 8 Jun 2021 21:10:00 -0400 Subject: [PATCH 021/134] Save LND_WTCLIENT_SWEEP_FEE to environment file --- helpers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers.sh b/helpers.sh index fbdf9a10f..f42e9e072 100755 --- a/helpers.sh +++ b/helpers.sh @@ -104,7 +104,8 @@ BTCPAY_CRYPTOS=$BTCPAY_CRYPTOS WOOCOMMERCE_HOST=$WOOCOMMERCE_HOST TOR_RELAY_NICKNAME=$TOR_RELAY_NICKNAME TOR_RELAY_EMAIL=$TOR_RELAY_EMAIL -EPS_XPUB=$EPS_XPUB" > $BTCPAY_ENV_FILE +EPS_XPUB=$EPS_XPUB +LND_WTCLIENT_SWEEP_FEE=$LND_WTCLIENT_SWEEP_FEE" > $BTCPAY_ENV_FILE env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true } From 71d967082c0e314d50fe959cb949568dd645a469 Mon Sep 17 00:00:00 2001 From: Nicolas Dorier Date: Thu, 12 Aug 2021 17:07:35 +0900 Subject: [PATCH 022/134] Bump BTCPay/NBX (#505) --- README.md | 4 ++-- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/btcpayserver.yml | 2 +- .../docker-fragments/nbxplorer.yml | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index a5229e9a3..bb5b03129 100644 --- a/README.md +++ b/README.md @@ -337,8 +337,8 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.12.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.1.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.1.51 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| btcpayserver/btcpayserver | 1.2.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index cf805767c..e3842b666 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.1.2/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.1.2$?" +echo "Building btcpayserver/btcpayserver:1.2.0$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.1.2 +git checkout v1.2.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.1.2$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.0$?" . cd - && cd .. @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.51/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.1.51" +echo "Building nicolasdorier/nbxplorer:2.1.58" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.1.51 +git checkout v2.1.58 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.1.51" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.1.58" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index dc619150f..cbb17d2ff 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.1.2$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.0$?} expose: - "49392" environment: diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index d41ed47b1..89721837c 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.1.51 + image: nicolasdorier/nbxplorer:2.1.58 expose: - "32838" environment: From 7574612a680d09d6e6e9ba3353c9db2d8dc3bf56 Mon Sep 17 00:00:00 2001 From: rockstardev <5191402+rockstardev@users.noreply.github.com> Date: Thu, 12 Aug 2021 03:11:41 -0500 Subject: [PATCH 023/134] Bump LND to v0.13.1-beta-withloop (#506) --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin-lnd.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bb5b03129..a4a47ef45 100644 --- a/README.md +++ b/README.md @@ -335,7 +335,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.12.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.13.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e3842b666..c59a1e928 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -170,18 +170,18 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.12.1-beta-withloop" +echo "Building btcpayserver/lnd:v0.13.1-beta-withloop" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.12.1-beta-withloop +git checkout basedon-v0.13.1-beta-withloop cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.12.1-beta-withloop" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.13.1-beta-withloop" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index a3fac26b4..0be255f16 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.12.1-beta-withloop + image: btcpayserver/lnd:v0.13.1-beta-withloop container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: From 88794fee09d0e2ef3ef98b3001e7cb3ed792cde5 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 12 Aug 2021 11:22:27 +0200 Subject: [PATCH 024/134] bump Clightning to 0.10.1 (#507) --- .../docker-fragments/bitcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 3555d5e23..8ab3c3ed5 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_bitcoin: - image: btcpayserver/lightning:v0.9.3-1 + image: btcpayserver/lightning:v0.10.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: From 40715684e12c9628a53c2ecb92cc6bb9cff206fb Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 12 Aug 2021 18:26:08 +0900 Subject: [PATCH 025/134] Update doc --- README.md | 6 +++--- contrib/DockerFileBuildHelper/Program.cs | 6 ++++++ contrib/build-all-images.sh | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a4a47ef45..089653035 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | | btcpayserver/bitcoin | 0.21.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/lightning | v0.9.3-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| btcpayserver/lightning | v0.10.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | @@ -342,7 +342,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | -| btcpayserver/btctransmuter | 0.0.56 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.56/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.56/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.56/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | +| btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | @@ -375,8 +375,8 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | +| dennisreimann/tallycoin_connect | v1.2.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| djbooth007/tallycoin_connect | v1.2.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index c51781c5e..2a39aa1a1 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -269,6 +269,12 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitRef = $"dcg-latest"; dockerInfo.SupportedByUs = true; break; + case "tallycoin_connect": + dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.GitLink = "https://github.com/dennisreimann/tallycoin_connect"; + dockerInfo.GitRef = $"{image.Tag}"; + dockerInfo.SupportedByUs = false; + break; case "docker-bitcoingold": dockerInfo.DockerFilePath = $"bitcoingold/{image.Tag}/Dockerfile"; dockerInfo.GitLink = "https://github.com/Vutov/docker-bitcoin"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c59a1e928..c089068ac 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/contrib/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.3-1/contrib/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.9.3-1" +echo "Building btcpayserver/lightning:v0.10.1" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.9.3-1 +git checkout basedon-v0.10.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.9.3-1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.1" . cd - && cd .. @@ -598,18 +598,18 @@ cd - && cd .. # Build btctransmuter -# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.56/Dockerfiles/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile DOCKERFILE="Dockerfiles/amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.56/Dockerfiles/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfiles/arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.56/Dockerfiles/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfiles/arm64v8.Dockerfile" -echo "Building btcpayserver/btctransmuter:0.0.56" +echo "Building btcpayserver/btctransmuter:0.0.57" git clone https://github.com/btcpayserver/btctransmuter btctransmuter cd btctransmuter -git checkout v0.0.56 +git checkout v0.0.57 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btctransmuter:0.0.56" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btctransmuter:0.0.57" . cd - && cd .. From b9777f975d0a1fabf26689da8ea35fa2df36c9b9 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 13 Aug 2021 00:37:04 +0900 Subject: [PATCH 026/134] Revert "Bump LND to v0.13.1-beta-withloop (#506)" This reverts commit 7574612a680d09d6e6e9ba3353c9db2d8dc3bf56. --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin-lnd.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 089653035..e093a32b8 100644 --- a/README.md +++ b/README.md @@ -335,7 +335,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.13.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.12.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c089068ac..d702236c7 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -170,18 +170,18 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.13.1-beta-withloop" +echo "Building btcpayserver/lnd:v0.12.1-beta-withloop" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.13.1-beta-withloop +git checkout basedon-v0.12.1-beta-withloop cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.13.1-beta-withloop" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.12.1-beta-withloop" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 0be255f16..a3fac26b4 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.13.1-beta-withloop + image: btcpayserver/lnd:v0.12.1-beta-withloop container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: From dade557853b371c49bf9567796fd2a6ee3bdd23d Mon Sep 17 00:00:00 2001 From: rockstardev <5191402+rockstardev@users.noreply.github.com> Date: Thu, 12 Aug 2021 22:49:46 -0500 Subject: [PATCH 027/134] Hotfix for problems with LND 0.13.1 (#508) * Revert "Revert "Bump LND to v0.13.1-beta-withloop (#506)"" This reverts commit b9777f975d0a1fabf26689da8ea35fa2df36c9b9. * Fetching version that waits for proper wallet unlock state before proceeding --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin-lnd.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e093a32b8..b88b9d88b 100644 --- a/README.md +++ b/README.md @@ -335,7 +335,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.12.1-beta-withloop | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index d702236c7..395907d67 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -170,18 +170,18 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.12.1-beta-withloop/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.12.1-beta-withloop" +echo "Building btcpayserver/lnd:v0.13.1-beta-withloop-fix" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.12.1-beta-withloop +git checkout basedon-v0.13.1-beta-withloop-fix cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.12.1-beta-withloop" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.13.1-beta-withloop-fix" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index a3fac26b4..71faa8345 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.12.1-beta-withloop + image: btcpayserver/lnd:v0.13.1-beta-withloop-fix container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: From 7a732e9c4a0aafd122cdf1f75cbb9dc0e7bbecdb Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 13 Aug 2021 16:11:49 +0900 Subject: [PATCH 028/134] bump --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b88b9d88b..49f313d0c 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.2.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 395907d67..bdf6d330a 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.0/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.0$?" +echo "Building btcpayserver/btcpayserver:1.2.1$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.0 +git checkout v1.2.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.0$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.1$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index cbb17d2ff..ea31c7e3e 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.2.0$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.1$?} expose: - "49392" environment: From e6f6568b9171d5be5887d1ba159c78b862fa084f Mon Sep 17 00:00:00 2001 From: Kukks Date: Thu, 19 Aug 2021 07:02:03 +0200 Subject: [PATCH 029/134] Bump RTL and Clightning-rest Only for clightning, separate PR for lnd --- .../docker-fragments/bitcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 8ab3c3ed5..77be2a815 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -55,7 +55,7 @@ services: - "9737" clightning_bitcoin_rest: - image: saubyk/c-lightning-rest:0.4.3 + image: saubyk/c-lightning-rest:0.4.4 restart: unless-stopped stop_signal: SIGKILL environment: @@ -73,7 +73,7 @@ services: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.10.0 + image: shahanafarooqui/rtl:0.11.0 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT From 8083d0a1d1fb6ec2d7e7f48329d486a4751fd03f Mon Sep 17 00:00:00 2001 From: Kukks Date: Thu, 19 Aug 2021 07:22:00 +0200 Subject: [PATCH 030/134] Update docker builder --- README.md | 4 +-- .../DockerFileBuildHelper.csproj | 3 +- contrib/DockerFileBuildHelper/Program.cs | 10 ++++-- contrib/build-all-images.sh | 32 +++++++++---------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 49f313d0c..b55884834 100644 --- a/README.md +++ b/README.md @@ -333,8 +333,8 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lightning | v0.10.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | -| saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | -| shahanafarooqui/rtl | 0.10.0 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| saubyk/c-lightning-rest | 0.4.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | +| shahanafarooqui/rtl | 0.11.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | diff --git a/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj b/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj index 5a77ed46f..1dbbc4f27 100644 --- a/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj +++ b/contrib/DockerFileBuildHelper/DockerFileBuildHelper.csproj @@ -2,7 +2,8 @@ Exe - netcoreapp2.1 + netcoreapp3.1 + 8 diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 2a39aa1a1..5c4842289 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -1,6 +1,4 @@ using System; -using YamlDotNet; -using YamlDotNet.Helpers; using System.Linq; using System.Collections.Generic; using System.IO; @@ -431,6 +429,14 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitRef = $"v{image.Tag.Substring(0, image.Tag.IndexOf('$'))}"; dockerInfo.SupportedByUs = true; break; + case "rtl" when image.Tag != "0.10.0": + dockerInfo.DockerFilePath = "docker/Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "docker/Dockerfile.arm32v7"; + dockerInfo.DockerFilePathARM64v8 = "docker/Dockerfile.arm64v8"; + dockerInfo.GitLink = "https://github.com/Ride-The-Lightning/RTL"; + dockerInfo.GitRef = $"v{image.Tag}"; + dockerInfo.SupportedByUs = true; + break; case "rtl": dockerInfo.DockerFilePath = "Dockerfile"; dockerInfo.DockerFilePathARM32v7 = "Dockerfile.arm32v7"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index bdf6d330a..776dd0881 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -110,34 +110,34 @@ cd - && cd .. # Build c-lightning-rest -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building saubyk/c-lightning-rest:0.4.3" +echo "Building saubyk/c-lightning-rest:0.4.4" git clone https://github.com/Ride-The-Lightning/c-lightning-REST c-lightning-rest cd c-lightning-rest -git checkout v0.4.3 +git checkout v0.4.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.4.3" . +docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.4.4" . cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile -DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.10.0" -git clone https://github.com/ShahanaFarooqui/RTL rtl +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile +DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" +echo "Building shahanafarooqui/rtl:0.11.0" +git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.10.0 +git checkout v0.11.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.10.0" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.0" . cd - && cd .. From eff6cb9d3289750023bf635f82b5b91141126e8e Mon Sep 17 00:00:00 2001 From: strophy <32928115+strophy@users.noreply.github.com> Date: Tue, 24 Aug 2021 04:21:39 +0200 Subject: [PATCH 031/134] chore: update to dash 0.17.0.3 (#509) * chore: update to dash 0.17.0.3 * chore: update dash.conf defaults --- README.md | 2 +- contrib/build-all-images.sh | 18 +++++++++--------- .../docker-fragments/dash.yml | 7 ++++++- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b55884834..fab220003 100644 --- a/README.md +++ b/README.md @@ -354,7 +354,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | | dalijolijo/docker-bitcore | 0.90.9.10 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | -| btcpayserver/dash | 0.16.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | +| btcpayserver/dash | 0.17.0.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | | btcpayserver/dogecoin | 1.14.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | | groestlcoin/docker-groestlcoin | 2.21.1 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 776dd0881..9c5477904 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -274,18 +274,18 @@ cd - && cd .. # Build dash -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile -DOCKERFILE="Dash/0.16.1.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dash/0.16.1.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dash/0.16.1.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/dash:0.16.1.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxamd64.Dockerfile +DOCKERFILE="Dash/0.17.0.3/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dash/0.17.0.3/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dash/0.17.0.3/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/dash:0.17.0.3" git clone https://github.com/btcpayserver/dockerfile-deps dash cd dash -git checkout Dash/0.16.1.1 +git checkout Dash/0.17.0.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/dash:0.16.1.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/dash:0.17.0.3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 429e7aa4b..004e9c521 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -4,12 +4,17 @@ services: dashd: restart: unless-stopped container_name: btcpayserver_dashd - image: btcpayserver/dash:0.16.1.1 + image: btcpayserver/dash:0.17.0.3 environment: + # rpcport and rpcbind seems duplicates, but they are not + # rpcport is using by some tooling to automatically get + # the rpcport from the configuration file. Do not remove! BITCOIN_EXTRA_ARGS: | ${NBITCOIN_NETWORK:-regtest}=1 port=9999 rpcport=9998 + rpcbind=0.0.0.0:9998 + rpcallowip=0.0.0.0/0 whitelist=0.0.0.0/0 expose: - "9998" From 989ca7ab9cb1df10cacc580e734a1c338d1e445e Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 30 Aug 2021 14:09:28 +0900 Subject: [PATCH 032/134] Bump RTL --- README.md | 2 +- contrib/build-all-images.sh | 52 +++++++++---------- .../docker-fragments/bitcoin-clightning.yml | 2 +- .../docker-fragments/bitcoin-eclair.yml | 2 +- .../docker-fragments/bitcoin-lnd.yml | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index fab220003..6f80c3b7d 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | -| shahanafarooqui/rtl | 0.11.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| shahanafarooqui/rtl | 0.11.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 9c5477904..4c5611d24 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -126,18 +126,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile DOCKERFILE="docker/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.0/docker/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.11.0" +echo "Building shahanafarooqui/rtl:0.11.1" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.11.0 +git checkout v0.11.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.0" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.1" . cd - && cd .. @@ -154,18 +154,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile -DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.10.0" -git clone https://github.com/ShahanaFarooqui/RTL rtl +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile +DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" +echo "Building shahanafarooqui/rtl:0.11.1" +git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.10.0 +git checkout v0.11.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.10.0" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.1" . cd - && cd .. @@ -186,18 +186,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile -DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.10.0/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.10.0" -git clone https://github.com/ShahanaFarooqui/RTL rtl +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile +DOCKERFILE="docker/Dockerfile" +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" +echo "Building shahanafarooqui/rtl:0.11.1" +git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.10.0 +git checkout v0.11.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.10.0" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 77be2a815..8930a3549 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -73,7 +73,7 @@ services: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.11.0 + image: shahanafarooqui/rtl:0.11.1 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 50f8acd7e..0a101bb13 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -41,7 +41,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.10.0 + image: shahanafarooqui/rtl:0.11.1 restart: unless-stopped environment: LN_IMPLEMENTATION: ECL diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 71faa8345..9a1ba0cfd 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -46,7 +46,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.10.0 + image: shahanafarooqui/rtl:0.11.1 restart: unless-stopped environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1 From 11e36a3d787a7136e19ebeec0f922216c95e0292 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 25 Aug 2021 14:27:25 +0200 Subject: [PATCH 033/134] Update Tallycoin Connect to v1.4.0 --- README.md | 2 +- contrib/build-all-images.sh | 10 ++++------ .../docker-fragments/opt-add-tallycoin-connect.yml | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6f80c3b7d..4a304a7c3 100644 --- a/README.md +++ b/README.md @@ -375,7 +375,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| dennisreimann/tallycoin_connect | v1.2.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| dennisreimann/tallycoin_connect | v1.4.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 4c5611d24..13fb9ce51 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -744,14 +744,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.2.0/Dockerfile +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building dennisreimann/tallycoin_connect:v1.2.0" +echo "Building dennisreimann/tallycoin_connect:v1.4.0" git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.2.0 +git checkout v1.4.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.2.0" . +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.4.0" . cd - && cd .. @@ -1021,5 +1021,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml index daf4051e8..1d0834134 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -6,7 +6,7 @@ services: volumes: - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" tallycoin_connect: - image: "dennisreimann/tallycoin_connect:v1.2.0@sha256:8f55332744d81507d275f61048da0952badfa9824e9759c52a3dfc048640a47b" + image: "dennisreimann/tallycoin_connect:v1.4.0" restart: unless-stopped expose: - "8123" @@ -17,6 +17,7 @@ services: PUBLIC_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/tallycoin-connect/ TALLYCOIN_APIKEY: "${TALLYCOIN_APIKEY}" TALLYCOIN_PASSWD: "${TALLYCOIN_PASSWD}" + LND_SOCKET: "lnd_bitcoin:10009" LND_MACAROON_PATH: /tallycoin_connect/lnd/admin.macaroon LND_TLSCERT_PATH: /tallycoin_connect/lnd/tls.cert PORT: 8123 From 80323309e6da427594c43816964553016b7aeb3b Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 25 Aug 2021 14:25:33 +0200 Subject: [PATCH 034/134] Update Sphinx Relay to v2.2.0 --- README.md | 2 +- contrib/build-all-images.sh | 12 +++++++----- .../docker-fragments/opt-add-sphinxrelay.yml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4a304a7c3..b003608ae 100644 --- a/README.md +++ b/README.md @@ -374,7 +374,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | -| sphinxlightning/sphinx-relay | v2.1.3 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | +| sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | dennisreimann/tallycoin_connect | v1.4.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 13fb9ce51..cc6c7da1b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -730,16 +730,16 @@ cd - && cd .. # Build sphinx-relay -# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile +# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.1.3/Dockerfile +# https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building sphinxlightning/sphinx-relay:v2.1.3" +echo "Building sphinxlightning/sphinx-relay:v2.2.0" git clone https://github.com/stakwork/sphinx-relay sphinx-relay cd sphinx-relay -git checkout v2.1.3 +git checkout v2.2.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.1.3" . +docker build -f "$DOCKERFILE" -t "sphinxlightning/sphinx-relay:v2.2.0" . cd - && cd .. @@ -1021,3 +1021,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml index 935a1b0a8..857825340 100644 --- a/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml @@ -6,7 +6,7 @@ services: volumes: - "sphinxrelay_datadir:/etc/sphinxrelay_datadir" sphinxrelay: - image: "sphinxlightning/sphinx-relay:v2.1.3@sha256:14b92d2376f12a0c9a1f8156b008795b1785983e9433b623c7cb8079f8c20b7f" + image: "sphinxlightning/sphinx-relay:v2.2.0" user: "0:0" restart: unless-stopped expose: From 1364529cd8b1fa21edb9588cd0fd888e239199f4 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 31 Aug 2021 16:28:28 +0900 Subject: [PATCH 035/134] bump btcpay --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b003608ae..82d429ce0 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index cc6c7da1b..743b97832 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.1/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.1$?" +echo "Building btcpayserver/btcpayserver:1.2.2$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.1 +git checkout v1.2.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.1$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.2$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index ea31c7e3e..7629eb429 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.2.1$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.2$?} expose: - "49392" environment: From 7fb8b6962489b395083589fe3676eb041c1e0009 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 31 Aug 2021 16:32:40 +0900 Subject: [PATCH 036/134] Update NBX --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 82d429ce0..2ef960606 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.1.58 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.0 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 743b97832..907c71c4c 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.58/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.1.58" +echo "Building nicolasdorier/nbxplorer:2.2.0" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.1.58 +git checkout v2.2.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.1.58" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.0" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 89721837c..38eea83f0 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.1.58 + image: nicolasdorier/nbxplorer:2.2.0 expose: - "32838" environment: From 4d9072c36df5b59c39771adef8051ddd60de3294 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 30 Aug 2021 10:20:32 +0200 Subject: [PATCH 037/134] Update liquid.yml --- docker-compose-generator/docker-fragments/liquid.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/liquid.yml b/docker-compose-generator/docker-fragments/liquid.yml index e72a61c41..12dc6f8b5 100644 --- a/docker-compose-generator/docker-fragments/liquid.yml +++ b/docker-compose-generator/docker-fragments/liquid.yml @@ -4,7 +4,7 @@ services: elementsd_liquid: restart: unless-stopped container_name: btcpayserver_elementsd_liquid - image: btcpayserver/elements:0.18.1.11 + image: btcpayserver/elements:0.18.1.12 environment: ELEMENTS_NETWORK: ${NBITCOIN_NETWORK:-regtest} ELEMENTS_MAINNET_CHAIN: "liquidv1" @@ -41,4 +41,4 @@ volumes: elements_wallet_datadir: recommended: - - "liquid-default-prune" \ No newline at end of file + - "liquid-default-prune" From fb7f2ff60c84699aa4f3656709534ec1a7e30e4f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 31 Aug 2021 21:23:27 +0900 Subject: [PATCH 038/134] bump nbx --- README.md | 4 +-- contrib/build-all-images.sh | 30 +++++++++---------- .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 2ef960606..151f44509 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.0 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.1 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | @@ -363,7 +363,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | groestlcoin/groestlcoin-spark | version-0.2.16 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) | | groestlcoin/eclair | v0.6.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) | | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) | -| btcpayserver/elements | 0.18.1.11 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | +| btcpayserver/elements | 0.18.1.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | | btcpayserver/monero | 0.17.2.0 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 907c71c4c..e432f16b2 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -386,18 +386,18 @@ cd - && cd .. # Build elements -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxamd64.Dockerfile -DOCKERFILE="Elements/0.18.1.11/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Elements/0.18.1.11/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.11/Elements/0.18.1.11/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Elements/0.18.1.11/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/elements:0.18.1.11" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxamd64.Dockerfile +DOCKERFILE="Elements/0.18.1.12/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Elements/0.18.1.12/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Elements/0.18.1.12/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/elements:0.18.1.12" git clone https://github.com/btcpayserver/dockerfile-deps elements cd elements -git checkout Elements/0.18.1.11 +git checkout Elements/0.18.1.12 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/elements:0.18.1.11" . +docker build -f "$DOCKERFILE" -t "btcpayserver/elements:0.18.1.12" . cd - && cd .. @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.0/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.0" +echo "Building nicolasdorier/nbxplorer:2.2.1" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.0 +git checkout v2.2.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.0" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 38eea83f0..0dd58af83 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.0 + image: nicolasdorier/nbxplorer:2.2.1 expose: - "32838" environment: From 33b01ba992a777fa1e336dd7132e4e452ea3e6a5 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 1 Sep 2021 16:57:50 +0900 Subject: [PATCH 039/134] bump nbx --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 151f44509..f9367c8f5 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.1 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.2 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e432f16b2..1d6ec59c7 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.1/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.1" +echo "Building nicolasdorier/nbxplorer:2.2.2" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.1 +git checkout v2.2.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.1" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 0dd58af83..76b452999 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.1 + image: nicolasdorier/nbxplorer:2.2.2 expose: - "32838" environment: From 5b133ea587a69ffe75476736865b263719a38ca7 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 27 Aug 2021 09:27:02 +0200 Subject: [PATCH 040/134] Update bitcoin-clightning.yml --- .../docker-fragments/bitcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 8930a3549..edbdd0619 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_bitcoin: - image: btcpayserver/lightning:v0.10.1 + image: btcpayserver/lightning:v0.10.1-1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: From 616494e3c45d3e40687298a485207bfb7079252f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 2 Sep 2021 13:05:00 +0900 Subject: [PATCH 041/134] bump nnbx --- README.md | 4 ++-- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index f9367c8f5..3613c7dce 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | | btcpayserver/bitcoin | 0.21.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/lightning | v0.10.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| btcpayserver/lightning | v0.10.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.2 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.3 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 1d6ec59c7..6d38f501b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1/contrib/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.10.1" +echo "Building btcpayserver/lightning:v0.10.1-1" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.10.1 +git checkout basedon-v0.10.1-1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.1-1" . cd - && cd .. @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.2/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.2" +echo "Building nicolasdorier/nbxplorer:2.2.3" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.2 +git checkout v2.2.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.2" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 76b452999..8f563ec08 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.2 + image: nicolasdorier/nbxplorer:2.2.3 expose: - "32838" environment: From b0ce3e1102add0a6484ee2edae12402166487ae2 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 2 Sep 2021 13:31:00 +0900 Subject: [PATCH 042/134] bump nbx --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3613c7dce..e00d7da0d 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.3 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.4 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 6d38f501b..4c12a3fb9 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.3/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.3" +echo "Building nicolasdorier/nbxplorer:2.2.4" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.3 +git checkout v2.2.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.3" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.4" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 8f563ec08..9684c2dc0 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.3 + image: nicolasdorier/nbxplorer:2.2.4 expose: - "32838" environment: From 4a429e8c6fc2653b887f5df04179612b109f0949 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 2 Sep 2021 18:37:21 +0900 Subject: [PATCH 043/134] bump nbx --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e00d7da0d..be1e97593 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.4 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.5 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 4c12a3fb9..29a669c10 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.4/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.4" +echo "Building nicolasdorier/nbxplorer:2.2.5" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.4 +git checkout v2.2.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.4" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.5" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 9684c2dc0..487061fed 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.4 + image: nicolasdorier/nbxplorer:2.2.5 expose: - "32838" environment: From 64fe7dbddc8ad13a722b910ae0864fc8aff00620 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 9 Sep 2021 22:21:15 +0900 Subject: [PATCH 044/134] Bump btcpay --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index be1e97593..4cc50b35f 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.5 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 29a669c10..3512b77d9 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.2$?" +echo "Building btcpayserver/btcpayserver:1.2.3$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.2 +git checkout v1.2.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.2$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.3$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 7629eb429..e39bf76c7 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.2.2$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.3$?} expose: - "49392" environment: From 40f27656845beeb26cbfe55dd375c5be1db2c2ec Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 9 Sep 2021 22:23:16 +0900 Subject: [PATCH 045/134] Revert "Bump btcpay" This reverts commit 64fe7dbddc8ad13a722b910ae0864fc8aff00620. --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4cc50b35f..be1e97593 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.5 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 3512b77d9..29a669c10 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.3$?" +echo "Building btcpayserver/btcpayserver:1.2.2$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.3 +git checkout v1.2.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.3$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.2$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index e39bf76c7..7629eb429 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.2.3$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.2$?} expose: - "49392" environment: From 53adb9582b82e00c8ac2c3cd193de024ed489fef Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 10 Sep 2021 00:17:26 +0900 Subject: [PATCH 046/134] Revert "Revert "Bump btcpay"" This reverts commit 40f27656845beeb26cbfe55dd375c5be1db2c2ec. --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index be1e97593..4cc50b35f 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.5 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 29a669c10..3512b77d9 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.2/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.2$?" +echo "Building btcpayserver/btcpayserver:1.2.3$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.2 +git checkout v1.2.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.2$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.3$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 7629eb429..e39bf76c7 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.2.2$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.3$?} expose: - "49392" environment: From c6bed37ff25fbebd52bbc5c3679cf6eb61d78306 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 10 Sep 2021 15:03:19 +0900 Subject: [PATCH 047/134] Bump RTL --- README.md | 2 +- contrib/build-all-images.sh | 36 +++++++++---------- .../docker-fragments/bitcoin-clightning.yml | 2 +- .../docker-fragments/bitcoin-eclair.yml | 2 +- .../docker-fragments/bitcoin-lnd.yml | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 4cc50b35f..9a75377a7 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.4.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | -| shahanafarooqui/rtl | 0.11.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 3512b77d9..04ed62987 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -126,18 +126,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile DOCKERFILE="docker/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.11.1" +echo "Building shahanafarooqui/rtl:0.11.2" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.11.1 +git checkout v0.11.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.1" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.2" . cd - && cd .. @@ -154,18 +154,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile DOCKERFILE="docker/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.11.1" +echo "Building shahanafarooqui/rtl:0.11.2" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.11.1 +git checkout v0.11.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.1" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.2" . cd - && cd .. @@ -186,18 +186,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile DOCKERFILE="docker/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.1/docker/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="docker/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.11.1" +echo "Building shahanafarooqui/rtl:0.11.2" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.11.1 +git checkout v0.11.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.1" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index edbdd0619..c15504ffd 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -73,7 +73,7 @@ services: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.11.1 + image: shahanafarooqui/rtl:0.11.2 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 0a101bb13..966d13a91 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -41,7 +41,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.11.1 + image: shahanafarooqui/rtl:0.11.2 restart: unless-stopped environment: LN_IMPLEMENTATION: ECL diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 9a1ba0cfd..1ced94e5c 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -46,7 +46,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.11.1 + image: shahanafarooqui/rtl:0.11.2 restart: unless-stopped environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1 From 216a0ab9cb368056d9aca3ab05ededf0991d1d52 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 10 Sep 2021 21:40:06 +0900 Subject: [PATCH 048/134] bump nbx --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9a75377a7..26a61ebab 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.5 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.6 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 04ed62987..3a921fa0b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.5/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.5" +echo "Building nicolasdorier/nbxplorer:2.2.6" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.5 +git checkout v2.2.6 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.5" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.6" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 487061fed..e9b2b3fe1 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.5 + image: nicolasdorier/nbxplorer:2.2.6 expose: - "32838" environment: From ddc35d58bcd55bc8454d8ee16b650eee11278b44 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 11 Sep 2021 14:04:04 +0900 Subject: [PATCH 049/134] bump --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 26a61ebab..632882204 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.6 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.7 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 3a921fa0b..e78125194 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.6/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.6" +echo "Building nicolasdorier/nbxplorer:2.2.7" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.6 +git checkout v2.2.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.6" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.7" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index e9b2b3fe1..45fd7617d 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.6 + image: nicolasdorier/nbxplorer:2.2.7 expose: - "32838" environment: From c2ba4399bc444b42ef10ddb5639c3913768be094 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 11 Sep 2021 19:50:59 +0900 Subject: [PATCH 050/134] New utxo-set for FastSync --- contrib/FastSync/load-utxo-set.sh | 4 +-- .../FastSync/sigs/NicolasDorier.utxo-sets.asc | 27 ++++++++++--------- contrib/FastSync/utxo-sets | 3 ++- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/contrib/FastSync/load-utxo-set.sh b/contrib/FastSync/load-utxo-set.sh index 0280c76e7..e2911ee4d 100755 --- a/contrib/FastSync/load-utxo-set.sh +++ b/contrib/FastSync/load-utxo-set.sh @@ -11,7 +11,7 @@ set -e # This will download the utxo set and untar it in bitcoin's folder # Usage: ./load-utxo-set.sh # This will use the tar to load the utxo in bitcoin's folder -# Usage: ./load-utxo-set.sh utxo-snapshot-bitcoin-mainnet-565305.tar +# Usage: ./load-utxo-set.sh utxo-snapshot-bitcoin-mainnet-699714.tar if ! [ "$0" = "$BASH_SOURCE" ]; then echo "This script must not be sourced" @@ -31,7 +31,7 @@ fi TAR_FILE="$1" if ! [[ "$UTXO_DOWNLOAD_LINK" ]]; then - [[ $NBITCOIN_NETWORK == "mainnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-mainnet-680891.tar" + [[ $NBITCOIN_NETWORK == "mainnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-mainnet-699714.tar" [[ $NBITCOIN_NETWORK == "testnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-testnet-1445586.tar" fi diff --git a/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc b/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc index ae1678dea..8cd441220 100644 --- a/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc +++ b/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc @@ -8,19 +8,20 @@ eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot- 52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar 0afe8ca07e0ad2b538f43fc3ada89500b3e8594e8c16e0813c30d25fcff0d5a3 utxo-snapshot-bitcoin-mainnet-651474.tar 587ac27b1929123313f842edbdb798afe116548e2a1bddea46d8d7068a6bc156 utxo-snapshot-bitcoin-mainnet-680891.tar +79d5b28fb140c23602bebaf90e829fc89aef2bb95cb2a5d492cd818f22f01836 utxo-snapshot-bitcoin-mainnet-699714.tar -----BEGIN PGP SIGNATURE----- -wsFcBAEBCAAQBQJgi7lfCRBmGHY+8JGG/gAA990QAIBhY/H7BYBJnJa06rUeSBwe -kX50wn1ypVqfjUE3VPJBB4jjf+c5PuuPG9qa+vvmZ1JL/5SBYVZSezpnsfyHPtGi -GzUB0do9G3pJxDybR4KyQTOgAdbA1U+ltO1QqxswnshkI5DtBFDgPPpI2dgjlcXB -bApYRjSWuocXXQK0WUsRNsDrHJqTq1aFXXvd9zzpogWtcB9RTpzL1HfCldO1Ou7z -wKzvAD0SQh5ccXODzhJxQfzEEX/UudEjDaFFbH9Q31hlwbUbPNqc57RWVvPNOnFQ -BBsyPbeUPR9rSzACuHfe9sb2WKfptN5hGzKQ4CbyOckh1BllG4kbvagjXoq8iXk6 -M5NqGgo1xEtII2WEAORzMTiZrtz58B5LTqu3g71rhVkt8VpuL2R0mqcppsbw/8s2 -49e6fZvwP2ja2I5i0Q/a+XrUB1dk3CZQ7PmKKJ2rCsOMI0AZEDdLYo8gAIsuzVEL -XEMYnEqK0CWhraDsTefwvnShQ8LK/MAtf+WGHXqKLF8Ocvgos2tQSzDg72/Zrh+g -TXLENeMSU+m/praSjLcb7FqVNW5a4ZFdtktW9ezNQ6BqitHea8FG6gFxwCxXIJXa -oIdngS9uPpvyyLKIGC8mXUHLcjVPXXZvo8pV2t57D8kD0M5syQQkndBpJrDo9loe -LBklhAcd6OAqzvLhb16y -=TDUX +wsFcBAEBCAAQBQJhPImlCRBmGHY+8JGG/gAAQ3kQADMkUecdSDGwF0EsIS7QM4Tb +ltEDeWx/zebZK6K+v1CKJUk9ObpZ3Y4LHKRB1zrOBo+qKv+DOZofDRNa+HCuyM01 +H6rRyRR9d5Hb3ASkWOtpW8sTO68zPIWxAbs4gh5moOj3Z6xzylrmTvh/64BKbIBN +kQ84EPSo7T49Uj+xm75fu8a5jvYIlrUAnYpHWN8c5k+7RRWfvSGzGFkL6dqgbXLS +h02mdGCnqc7rjF1UGYgVRgKA3X15rHdwKgVY3yn7APFw56WdMVvty/HStX6Ykl9e +g0FmIV0rq3CQ8OLGyla9LQeN5sBqBOaUyzC0zVIOdyQJRlmeFSSzFX2g7v9Xb87u +b1TlqoQkvOyclPZ3RGqXcLRND14dmkTiuuh7EvVQ4pq2P5Cb4JwrOQjuIT0DIlOD +q7z6vqJuVMF2g8bwDXOuNbuwWvTBA1KrWtAX3g+qhRgkNUv8hPpUKi5RMWYgPjqb +XaW5ofyjKOE9Ba+HpZzSEe0OGoD/qatx67vu3Aql7himZg4TJq9Q1Ix2A14NXKGS +0M1koBWYqpJNm+oNpEqnWLU8L3t16kJxl99GrHDbTs6+gO6BYpPvUOd/K1MJhn74 +8w8SrQBwIROKaQjAgd8yymjQvFOfr6tjVnfmoAMtltYF9SEucmUcjySYvPXmzfWj +RRjJES1SdLwidCD87+dI +=9R74 -----END PGP SIGNATURE----- diff --git a/contrib/FastSync/utxo-sets b/contrib/FastSync/utxo-sets index da80b0a3a..037a2e600 100644 --- a/contrib/FastSync/utxo-sets +++ b/contrib/FastSync/utxo-sets @@ -4,4 +4,5 @@ eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot- 58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098 utxo-snapshot-bitcoin-mainnet-585333.tar 52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar 0afe8ca07e0ad2b538f43fc3ada89500b3e8594e8c16e0813c30d25fcff0d5a3 utxo-snapshot-bitcoin-mainnet-651474.tar -587ac27b1929123313f842edbdb798afe116548e2a1bddea46d8d7068a6bc156 utxo-snapshot-bitcoin-mainnet-680891.tar \ No newline at end of file +587ac27b1929123313f842edbdb798afe116548e2a1bddea46d8d7068a6bc156 utxo-snapshot-bitcoin-mainnet-680891.tar +79d5b28fb140c23602bebaf90e829fc89aef2bb95cb2a5d492cd818f22f01836 utxo-snapshot-bitcoin-mainnet-699714.tar \ No newline at end of file From 3bf838f800a4f4295b06c26dce516e53bd5b604d Mon Sep 17 00:00:00 2001 From: Seth Simmons Date: Wed, 15 Sep 2021 01:54:03 -0400 Subject: [PATCH 051/134] Bump Monero to v0.17.2.3 (#522) Co-authored-by: Seth Simmons Co-authored-by: Seth Simmons Co-authored-by: Seth Simmons --- docker-compose-generator/docker-fragments/monero.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/monero.yml b/docker-compose-generator/docker-fragments/monero.yml index e65902286..9d07a050c 100644 --- a/docker-compose-generator/docker-fragments/monero.yml +++ b/docker-compose-generator/docker-fragments/monero.yml @@ -4,7 +4,7 @@ services: monerod: restart: unless-stopped container_name: btcpayserver_monerod - image: btcpayserver/monero:0.17.2.0 + image: btcpayserver/monero:0.17.2.3 entrypoint: monerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --non-interactive --block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --hide-my-port --prune-blockchain --enable-dns-blocklist expose: - "18081" @@ -13,7 +13,7 @@ services: monerod_wallet: restart: unless-stopped container_name: btcpayserver_monero_wallet - image: btcpayserver/monero:0.17.2.0 + image: btcpayserver/monero:0.17.2.3 entrypoint: monero-wallet-rpc --rpc-bind-ip=0.0.0.0 --disable-rpc-login --confirm-external-bind --rpc-bind-port=18082 --non-interactive --trusted-daemon --daemon-address=monerod:18081 --wallet-file=/wallet/wallet --password-file=/wallet/password --tx-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/tx?cryptoCode=xmr&hash=%s" expose: - "18082" From aa16f1ab28750aeb27f95a81bf2d385f35cd973a Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 20 Sep 2021 12:39:26 +0200 Subject: [PATCH 052/134] Bump NBX (#528) --- docker-compose-generator/docker-fragments/nbxplorer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 45fd7617d..457153731 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.7 + image: nicolasdorier/nbxplorer:2.2.9 expose: - "32838" environment: From 1866e0fd73406fdf822df5e754f093e84190d364 Mon Sep 17 00:00:00 2001 From: britttttk <39231115+britttttk@users.noreply.github.com> Date: Mon, 20 Sep 2021 21:56:59 -0600 Subject: [PATCH 053/134] Update FastSync sig for 699714 and testnet (#532) --- .../FastSync/sigs/brittkelly.utxo-sets.asc | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/contrib/FastSync/sigs/brittkelly.utxo-sets.asc b/contrib/FastSync/sigs/brittkelly.utxo-sets.asc index 6f7d553bc..676fc00ca 100644 --- a/contrib/FastSync/sigs/brittkelly.utxo-sets.asc +++ b/contrib/FastSync/sigs/brittkelly.utxo-sets.asc @@ -1,20 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot-bitcoin-testnet-1445586.tar 58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098 utxo-snapshot-bitcoin-mainnet-585333.tar +79d5b28fb140c23602bebaf90e829fc89aef2bb95cb2a5d492cd818f22f01836 utxo-snapshot-bitcoin-mainnet-699714.tar -----BEGIN PGP SIGNATURE----- -wsFcBAEBCAAQBQJdbzuvCRALBDDNn2xJswAAAi4QAEXnV/2HBXogOmQRC1Tlpy5I -hHjaNXy2ygHKTWECRQsZb7EzVtpEKK55Md7/yH1REy0Q9aoWxilWu0VLI52//NS5 -+tNhTipj3/ykUPaMZSfHdY/OU8Czkzpfzzqi4swddgQWPHcL20g8Xgl/OQPfNWN3 -+Bgjsvv1c3p2iXdMjg5JeQjN+qA1Byv4UJ9zcpiIADR1DLFR3PbjFhLx0vM9abO6 -TQa2XBfNaH3Jm9zJJgth7Xq5n061aw8ZKO+KxPe415G6xtFVL7lXnBifzHiWwF0F -0wl9/5y3pv7SXn5T3tasgqB17hNcQJFp7aXsaCu6K0rVcwvGpDdKfe4FAfVpkuje -c8z0zJ7Brg5ito7Mtmx4O+9m6qTEdjYsAYRenTMZX7a7legPMIZ4KomfjUit/Cw7 -PdNH1n56eE5fN97no14dyrTsb6hFQ02soO+X+Z3FhkM92ocjpKBdyeouw+bs6hYT -aGtMA80rMHGhXFz/zRxZiRpDz+RkYUwaNnmsr0NvxmWqaIBKZjM3LYYKKn6URVFY -U2Xxr9RyThD8AW0bMiKc5cHQJD8j45PIMWSsxVbTHduEm9gFHH0TCaCOrYRUHk+y -jIDevEv3nbg7A9kyARpnuS5Yfg5SDMpgNFZEPuCZdH9By3M7jBg3Y7cxOdZAs07p -GPQRzKSRqbbIfB7E1cht -=IAdY +wsFcBAEBCAAQBQJhSAalCRBzZKIvLFvMBgAAH+YQAIWRnx//WaWVfdpndcgT5CwM +THkuIhyWpJBqrHOczMtaLN0+MX7yunoxpxcPnUHCsFmyo18+mm5AYAZHHjmVD/+d +lszPAXgGxefHXA7vOSvTj5Z0MBgaoc9VHimmMpURyVL+TgDMep8BvxzYJ/uFJybW +Es2Pazm3CFHGZ3AC7b62+mTE21oCrGibSKCaQQ6laCE6QIzQsy3e7/xlWQt6/jV/ +t7E8SJFTFZhlDj/ElYChWn9tESqhxKg+5oL/uDdnpWZHHCntWbPf4+YXUviakFzj +bejH6L5xh/anOJxslDK/BJMdhDzkyl2J/Ut6rzQzgcboDiKJbH17a31aySJuco43 +gqe+PZqEuoAQeQ1mmXyeXEoge1dpoueOgOLEQTNeYCRDdyODAyGknlMzy1B/K/2Z +xHsexIhhzZzNqxDTD0IcY6dUIehaCDRv15iTjwvgoXxlHFduPTMX8v7IKpWsns89 +zCDHSnCZpoeWhUEGADjgervqTgFNsUrDUesEAKwhrx9jAlH2eX3mWwYbRE8AFrmJ +EhA1hPfc8KD1qWw/nNtsHk/e5guwtGlYCeJACKKwgOCXyZeh/Xhj+jyrxu9aKF8s +ZQ8YttvLT05ZT4QjKXlcXU1ZtENBqF4Vm7Sp7Disjp4cuVRf2J+sYBYc6qdrYfee +CMh2ZoVAIlaCmaAOOLPr +=Kkee -----END PGP SIGNATURE----- From d9ba5a29b4498daaaba538ed4dec1592430b44bf Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 21 Sep 2021 12:57:15 +0900 Subject: [PATCH 054/134] Update signature for fastsync (#526) --- contrib/FastSync/sigs/JUnderwood.utxo-sets.asc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc b/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc index 4ae3e085b..7d96a5ec8 100644 --- a/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc +++ b/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc @@ -8,14 +8,15 @@ eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot- 52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar 0afe8ca07e0ad2b538f43fc3ada89500b3e8594e8c16e0813c30d25fcff0d5a3 utxo-snapshot-bitcoin-mainnet-651474.tar 587ac27b1929123313f842edbdb798afe116548e2a1bddea46d8d7068a6bc156 utxo-snapshot-bitcoin-mainnet-680891.tar +79d5b28fb140c23602bebaf90e829fc89aef2bb95cb2a5d492cd818f22f01836 utxo-snapshot-bitcoin-mainnet-699714.tar -----BEGIN PGP SIGNATURE----- -iQEzBAEBCgAdFiEEC5br8+cf2C1k8QnTslYYXTqXGQgFAmCMIvQACgkQslYYXTqX -GQj6tQgAkzRlPoeab+eArO7JIppONiLiH8RsK4GOP7nsW4f0c3xeV9KbCQVxV054 -WZDD/cDr2zrbe6JjQfF2Db2n95vhLJgvcY2n++hjKQBZoqb0VDZNRFcgKCXbc2ge -ypKfUaS7aeJOXOKuOpsEEG6miVlj5q/AC1zSBr+0zqRJ/lOGbHmkXaj25QE5lbBh -bhIij6OhRwydxN1RLvnGxTycO1PA7tnMeHMKoZnAGOTHP66YgyrZaFyOr+BA37ju -jGXUvOIj2KY+PGALwhfY17UbPiLJDJIjr0SakM261EU9xY8T6Tgzec2oihqUtL2s -zzQlSNk2vhW8k0TDHKtHqPymGOOBAQ== -=wFUu +iQEzBAEBCgAdFiEEC5br8+cf2C1k8QnTslYYXTqXGQgFAmE8wZIACgkQslYYXTqX +GQhObgf/XnoJxp2/eCZ/8V/rgyTHCmG3NR405ejGV3EFpzAP1UrULJbGABarKqts +9RyfDCAZ09YODoSXDuZfBS83mbooHGKKNejGgiiLu8KbnefmC+N5jsia9ZQYrFS2 +hrteEEk5FYVtK3nFnwIinZaVThbR6EN+t/G1BMte3nzWFQpBPXUo0tkC3wwjwKxm +xWcK2uuCOzJ196Y2BaW++bwcexlQrFTRzgwaLzDy+Mlepc4VEu7vWFnsdtZAgsXE +TFvboNaZH41LIMGFC+EEiEDTodcwlvFKYpCB6D8I9pZZ48HEImUQTMde/QYdWPHy +qaej7Pcv1E10EZNGJLcwZcZ/7nRFjQ== +=1RqT -----END PGP SIGNATURE----- From baf3cbe5c7b17e2408bbf74dfaa791ab58f89418 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Tue, 21 Sep 2021 09:35:04 +0200 Subject: [PATCH 055/134] Provide plugin directory for Clightning (#518) --- .../docker-fragments/bitcoin-clightning.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index c15504ffd..87f4d1c93 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -14,9 +14,11 @@ services: LIGHTNINGD_READY_FILE: /root/.nbxplorer/btc_fully_synched LIGHTNINGD_OPT: | bitcoin-datadir=/etc/bitcoin - bitcoin-rpcconnect=bitcoind + bitcoin-rpcconnect=bitcoind + plugin-dir=/etc/clightningplugins volumes: - "clightning_bitcoin_datadir:/root/.lightning" + - "clightning_bitcoin_plugindir:/etc/clightningplugins" - "bitcoin_datadir:/etc/bitcoin" - "nbxplorer_datadir:/root/.nbxplorer" ports: @@ -110,6 +112,7 @@ services: - clightning_bitcoin volumes: clightning_bitcoin_datadir: + clightning_bitcoin_plugindir: clightning_bitcoin_spark: clightning_bitcoin_charge: clightning_bitcoin_rtl_datadir: From 84d79fd41b2f3d7d1b1d0c9a7ac46933bbe3557d Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 21 Sep 2021 16:07:18 +0900 Subject: [PATCH 056/134] Make btcpay-restart properly restart everything (Fix #524) --- helpers.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/helpers.sh b/helpers.sh index f42e9e072..b4d7e83ac 100755 --- a/helpers.sh +++ b/helpers.sh @@ -147,6 +147,7 @@ btcpay_restart() { if ! [ $? -eq 0 ]; then docker-compose -f $BTCPAY_DOCKER_COMPOSE restart fi + btcpay_up popd > /dev/null } From ce0f21793561584a5adaa456d25d42f716ef2a66 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 21 Sep 2021 20:53:14 +0900 Subject: [PATCH 057/134] Update nbx --- README.md | 4 ++-- contrib/build-all-images.sh | 20 +++++++++---------- .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 632882204..aa63ed6ff 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.7 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.10 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | @@ -366,7 +366,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/elements | 0.18.1.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | -| btcpayserver/monero | 0.17.2.0 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | +| btcpayserver/monero | 0.17.2.3 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | redis | 6.2.2-buster | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | bluewalletorganization/lndhub | v1.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e78125194..e9f84a735 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -462,40 +462,40 @@ cd - && cd .. # Build monero # https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.17.2.0" +echo "Building btcpayserver/monero:0.17.2.3" git clone https://github.com/Kukks/monero-docker monero cd monero git checkout x86_64 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.2.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.2.3" . cd - && cd .. # Build monero # https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.17.2.0" +echo "Building btcpayserver/monero:0.17.2.3" git clone https://github.com/Kukks/monero-docker monero cd monero git checkout x86_64 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.2.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.2.3" . cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.7/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.7" +echo "Building nicolasdorier/nbxplorer:2.2.10" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.7 +git checkout v2.2.10 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.7" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.10" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index 457153731..b0138be3d 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.9 + image: nicolasdorier/nbxplorer:2.2.10 expose: - "32838" environment: From 29df796a99787cadb31b0ea486608ecef1cdd01e Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Wed, 22 Sep 2021 13:25:55 +0200 Subject: [PATCH 058/134] Update bitcoin-clightning.yml --- .../docker-fragments/bitcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 87f4d1c93..fa7473de6 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_bitcoin: - image: btcpayserver/lightning:v0.10.1-1 + image: btcpayserver/lightning:v0.10.1-2 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: From d7b6e47b5a08c2e92324e5093759c06abe41be12 Mon Sep 17 00:00:00 2001 From: Downet <78277193+downet@users.noreply.github.com> Date: Thu, 23 Sep 2021 07:48:32 +0200 Subject: [PATCH 059/134] Bumping RTL to 0.11.2 due to bug with peering (#523) From 8dfd554f58d2f35d12a2d75acdc570820ee08f2f Mon Sep 17 00:00:00 2001 From: d11n Date: Thu, 23 Sep 2021 07:49:18 +0200 Subject: [PATCH 060/134] Script fix (#520) --- .../taproot_bip8_lottrue_switch.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh b/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh index 8a042e2a2..1594fd2ee 100644 --- a/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh +++ b/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh @@ -1,6 +1,6 @@ #!/bin/bash if [[ "$0" = "$BASH_SOURCE" ]]; then - echo "This script must be sourced \". taproot_bip8_lottrue_switch.sh\"" + echo "This script must be sourced \". taproot_bip8_lottrue_switch.sh\"" exit 1 fi @@ -15,8 +15,9 @@ if [[ "$BTCPAYGEN_ADDITIONAL_FRAGMENTS" =~ "bitcointaprootcc-bip8-lottrue" ]]; t export BTCPAYGEN_EXCLUDE_FRAGMENTS="${BTCPAYGEN_EXCLUDE_FRAGMENTS//bitcoin;/}" . btcpay-setup.sh -i - cd Tools echo "Configured to use Bitcoin Core release." - exit 0 + cd Tools + echo "Configured to use Bitcoin Core release." + exit 0 fi @@ -32,4 +33,4 @@ export BTCPAYGEN_EXCLUDE_FRAGMENTS="$BTCPAYGEN_EXCLUDE_FRAGMENTS;bitcoin;" . btcpay-setup.sh -i cd Tools -echo "Configured to use https://bitcointaproot.cc release." \ No newline at end of file +echo "Configured to use https://bitcointaproot.cc release." From d09338b2e5535d32d42148c64481ec6ec2fdf6de Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 23 Sep 2021 11:04:11 +0200 Subject: [PATCH 061/134] Feat/fireflyiii (#344) * Adding Firefly-iii opt fragment * Adding environment variable to force creation of db * Instructing postgres to create database * Switching exposing default port, running create db command * Remove grep command for postgres container * Removing database creation on postgres container start * Adding required App Key env variable * Updating nginx rewriting * Updating firefly nginx confugration traying to make it work with subdirectory https://github.com/firefly-iii/firefly-iii/issues/2848#issuecomment-557845301 * Trying to rewrite * Reconfiguring nginx to pass headers * Updating docker fragment * Last try * Allowing firefly iii to be hosted on other domain * Fixing docker compose env variables * Exposing ports for external communication * Ports exposing * Updating firefly host reference * Matching service name and VIRTUAL_HOST_NAME * Getting nginx to redirect to port 8080 * update and adapt * Adapt firefly to be with dedicated domain * Adapt Docker file builder to support non github builds * Make firefly init create db only if not exists + run full recommended upgrade procedure Co-authored-by: rockstardev --- README.md | 3 ++ Tools/fireflyiii/init.sh | 11 +++++++ btcpay-setup.sh | 2 ++ contrib/DockerFileBuildHelper/DockerInfo.cs | 4 +-- contrib/DockerFileBuildHelper/Program.cs | 9 ++++++ contrib/build-all-images.sh | 16 ++++++++++ .../docker-fragments/opt-add-fireflyiii.yml | 32 +++++++++++++++++++ docs/fireflyiii.md | 18 +++++++++++ helpers.sh | 3 +- 9 files changed, 95 insertions(+), 3 deletions(-) create mode 100755 Tools/fireflyiii/init.sh create mode 100644 docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml create mode 100644 docs/fireflyiii.md diff --git a/README.md b/README.md index aa63ed6ff..2f3e321e9 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ Additionally, there are specific environment variables for some addons: * `EPS_XPUB`: If Electrum Personal Server (EPS) is activated with [opt-add-electrum-ps](docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml), you must set the Extended Public Key (XPUB, YPUB or ZPUB) of the wallet you want to use, before first run of the EPS server. If you accidently start EPS without this, it will not work properly as the model of EPS is to monitor only specified wallets. * If Bitcoin Wallet Tracker is activated with [opt-add-bwt](docker-compose-generator/docker-fragments/opt-add-bwt.yml), you can use `BWT_XPUB`/`BWT_XPUB_*` (to set your XPUB/YPUB/ZPUB), `BWT_DESCRIPTOR`/`BWT_DESCRIPTOR_*` (for script descriptors), `BWT_RESCAN_SINCE` (set to the wallet creation date in YYYY-MM-DD to speed up the rescan), `BWT_BITCOIND_WALLET` and `BWT_GAP_LIMIT`. * `LND_WTCLIENT_SWEEP_FEE`: If LND watchtower is activated with [opt-lnd-wtclient](docker-compose-generator/docker-fragments/opt-lnd-wtclient.yml), you can use `LND_WTCLIENT_SWEEP_FEE` to change the sweep fee used in constructing the justice transaction (default is 10 sat/byte) +* `FIREFLY_HOST`: If fireflyiii is activated with [opt-add-fireflyiii](docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml), the hostname of your fireflyiii website (eg. `firefly.example.com`) # Tooling A wide variety of useful scripts are available once BTCPay is installed: @@ -181,6 +182,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect. * [opt-add-zammad](docker-compose-generator/docker-fragments/opt-add-zammad.yml) for [Zammad](https://zammad.com/features), a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails * [opt-monero-expose](docker-compose-generator/docker-fragments/opt-monero-expose.yml) to expose monero node's RPC port at 127.0.0.1:18081 to connect your own wallet. Use f.e. ssh port forwarding to forward to your own computer. +* [opt-add-fireflyiii](docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml) ([See the documentation](docs/fireflyiii.md)) You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file). @@ -372,6 +374,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | shesek/bwt | 0.2.2-electrum | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm64v8.Dockerfile) | [Github](https://github.com/bwt-dev/bwt) - [DockerHub](https://hub.docker.com/r/shesek/bwt) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | +| fireflyiii/core | latest | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [Github](https://dev.azure.com/Firefly-III/_git/MainImage) - [DockerHub](https://hub.docker.com/r/fireflyiii/core) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | diff --git a/Tools/fireflyiii/init.sh b/Tools/fireflyiii/init.sh new file mode 100755 index 000000000..ae2926668 --- /dev/null +++ b/Tools/fireflyiii/init.sh @@ -0,0 +1,11 @@ +#!/bin/bash + + +[[ $(docker exec $(docker ps -a -q -f "name=postgres_1") psql -U postgres -tc "SELECT 1 FROM pg_database WHERE datname = 'fireflyiii'") =~ "1" ]] || docker exec $(docker ps -a -q -f "name=postgres_1") psql -U postgres -c "CREATE DATABASE fireflyiii" +docker exec generated_fireflyiii_1 php artisan migrate --seed +docker exec generated_fireflyiii_1 php artisan firefly-iii:decrypt-all +docker exec generated_fireflyiii_1 php artisan cache:clear +docker exec generated_fireflyiii_1 php artisan firefly-iii:upgrade-database +docker exec generated_fireflyiii_1 php artisan passport:install +docker exec generated_fireflyiii_1 php artisan cache:clear +exit 0 \ No newline at end of file diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 059759fad..10198e580 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -107,6 +107,7 @@ Add-on specific variables: BTCTRANSMUTER_HOST: If btc transmuter is activated with opt-add-btctransmuter, the hostname of your btc transmuter website (eg. store.example.com) TOR_RELAY_NICKNAME: If tor relay is activated with opt-add-tor-relay, the relay nickname TOR_RELAY_EMAIL: If tor relay is activated with opt-add-tor-relay, the email for Tor to contact you regarding your relay + FIREFLY_HOST: If fireflyiii is activated with opt-add-fireflyiii, the hostname of your libre patron website (eg. firefly.example.com) END } START="" @@ -309,6 +310,7 @@ ACME_CA_URI:$ACME_CA_URI TOR_RELAY_NICKNAME: $TOR_RELAY_NICKNAME TOR_RELAY_EMAIL: $TOR_RELAY_EMAIL PIHOLE_SERVERIP: $PIHOLE_SERVERIP +FIREFLY_HOST: $FIREFLY_HOST ---------------------- Additional exported variables: BTCPAY_DOCKER_COMPOSE=$BTCPAY_DOCKER_COMPOSE diff --git a/contrib/DockerFileBuildHelper/DockerInfo.cs b/contrib/DockerFileBuildHelper/DockerInfo.cs index 02d33676b..16f3b628c 100644 --- a/contrib/DockerFileBuildHelper/DockerInfo.cs +++ b/contrib/DockerFileBuildHelper/DockerInfo.cs @@ -14,10 +14,10 @@ public class DockerInfo public string GitRef { get; set; } public bool SupportedByUs { get; set; } public Image Image { get; internal set; } - + public string RawLink { get; set; } public string GetGithubLinkOf(string path) { - return $"https://raw.githubusercontent.com/{GitLink.Substring("https://github.com/".Length)}/{GitRef}/{path}"; + return RawLink ?? $"https://raw.githubusercontent.com/{GitLink.Substring("https://github.com/".Length)}{(GitRef is null ? string.Empty : ("/" + GitRef))}/{path}"; } } } diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 5c4842289..647a5f8bd 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -636,6 +636,15 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitLink = "https://github.com/BlueWallet/LndHub"; dockerInfo.GitRef = $"{image.Tag.Split("@")[0]}"; break; + case "fireflyiii/core": + dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; + dockerInfo.GitLink = "https://dev.azure.com/Firefly-III/_git/MainImage"; + dockerInfo.RawLink = "https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true"; + + dockerInfo.GitRef = null; + break; default: if (firstTry) { diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e9f84a735..f6e8891fd 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -673,6 +673,22 @@ docker build -f "$DOCKERFILE" -t "lukechilds/electrumx:latest" . cd - && cd .. +# Build core +# https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true +DOCKERFILE="Dockerfile" +# https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" +# https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" +echo "Building fireflyiii/core:latest" +git clone https://dev.azure.com/Firefly-III/_git/MainImage core +cd core +git checkout +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . +cd - && cd .. + + # Build librepatron # https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile DOCKERFILE="Dockerfile" diff --git a/docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml b/docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml new file mode 100644 index 000000000..c7df0c568 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml @@ -0,0 +1,32 @@ +version: '3' + +services: + fireflyiii: + image: fireflyiii/core:latest + environment: + - APP_ENV=local + - APP_KEY=MustBe32DropDbAndChangeItIfUWant + - APP_URL=http://${FIREFLY_HOST} + - TRUSTED_PROXIES=** + - DB_CONNECTION=pgsql + - DB_HOST=postgres + - DB_PORT=5432 + - DB_DATABASE=fireflyiii + - DB_USERNAME=postgres + - DB_PASSWORD= + - VIRTUAL_HOST_NAME=fireflyiii + - VIRTUAL_HOST=${FIREFLY_HOST} + - VIRTUAL_PORT=8080 + - LETSENCRYPT_HOST=${FIREFLY_HOST} + - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL:-} + expose: + - 8080 + volumes: + - firefly_iii_export:/var/www/firefly-iii/storage/export + - firefly_iii_upload:/var/www/firefly-iii/storage/upload + depends_on: + - postgres + +volumes: + firefly_iii_export: + firefly_iii_upload: \ No newline at end of file diff --git a/docs/fireflyiii.md b/docs/fireflyiii.md new file mode 100644 index 000000000..f05efcd3c --- /dev/null +++ b/docs/fireflyiii.md @@ -0,0 +1,18 @@ +# Firefly III support + +[Firefly III](https://pi-hole.net/) is a self-hosted financial manager. +It can help you keep track of expenses, income, budgets and everything in between. It supports credit cards, shared household accounts and savings accounts. It’s pretty fancy. You should use it to save and organise money. + +## How to use + +1. Connect as root to your server +2. Configure a domain's DNS to point to your server ip. e.g. `firefly.yourserver.org` +3. Add fireflyiii as an option to your docker deployment + +```bash +BTCPAYGEN_ADDITIONAL_FRAGMENTS="$BTCPAYGEN_ADDITIONAL_FRAGMENTS;opt-add-fireflyiii" +FIREFLY_HOST="firefly.yourserver.org" +. btcpay-setup.sh -i +. ./Tools/fireflyiii/init.sh +``` +4. Access Firefly III at `firefly.yourserver.org` and create your admin account. diff --git a/helpers.sh b/helpers.sh index b4d7e83ac..f175f2da7 100755 --- a/helpers.sh +++ b/helpers.sh @@ -105,7 +105,8 @@ WOOCOMMERCE_HOST=$WOOCOMMERCE_HOST TOR_RELAY_NICKNAME=$TOR_RELAY_NICKNAME TOR_RELAY_EMAIL=$TOR_RELAY_EMAIL EPS_XPUB=$EPS_XPUB -LND_WTCLIENT_SWEEP_FEE=$LND_WTCLIENT_SWEEP_FEE" > $BTCPAY_ENV_FILE +LND_WTCLIENT_SWEEP_FEE=$LND_WTCLIENT_SWEEP_FEE +FIREFLY_HOST=$FIREFLY_HOST" > $BTCPAY_ENV_FILE env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true } From ecddf1e599718f718344d13b7da3a1a7899f3dc8 Mon Sep 17 00:00:00 2001 From: Mike Olthoff Date: Thu, 23 Sep 2021 02:10:57 -0700 Subject: [PATCH 062/134] Update dogecoin.yml (#533) --- docker-compose-generator/docker-fragments/dogecoin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/dogecoin.yml b/docker-compose-generator/docker-fragments/dogecoin.yml index a1c408e25..36045e72e 100644 --- a/docker-compose-generator/docker-fragments/dogecoin.yml +++ b/docker-compose-generator/docker-fragments/dogecoin.yml @@ -4,7 +4,7 @@ services: dogecoind: restart: unless-stopped container_name: btcpayserver_dogecoind - image: btcpayserver/dogecoin:1.14.3 + image: btcpayserver/dogecoin:1.14.4 environment: DOGECOIN_EXTRA_ARGS: | rpcuser=ceiwHEbqWI83 From 0eaf203419b73cc12af265c77baf19aa6fa2604b Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 24 Sep 2021 12:43:42 +0900 Subject: [PATCH 063/134] Set Default ACME production --- docker-compose-generator/docker-fragments/nginx-https.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/nginx-https.yml b/docker-compose-generator/docker-fragments/nginx-https.yml index 9f85204e3..dafb80d5f 100644 --- a/docker-compose-generator/docker-fragments/nginx-https.yml +++ b/docker-compose-generator/docker-fragments/nginx-https.yml @@ -14,7 +14,7 @@ services: environment: NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-staging} + ACME_CA_URI: ${ACME_CA_URI:-production} links: - nginx-gen From 2f00fe98e076d131051aef6483923fecb887640b Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 25 Sep 2021 00:16:16 +0900 Subject: [PATCH 064/134] Update Lightning-Rest --- README.md | 6 ++-- contrib/build-all-images.sh | 34 +++++++++---------- .../docker-fragments/bitcoin-clightning.yml | 3 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 2f3e321e9..0f3cdd325 100644 --- a/README.md +++ b/README.md @@ -332,10 +332,10 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | | btcpayserver/bitcoin | 0.21.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/lightning | v0.10.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | -| saubyk/c-lightning-rest | 0.4.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | +| saubyk/c-lightning-rest | 0.5.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | @@ -357,7 +357,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | | dalijolijo/docker-bitcore | 0.90.9.10 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | | btcpayserver/dash | 0.17.0.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.17.0.3/Dash/0.17.0.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | -| btcpayserver/dogecoin | 1.14.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | +| btcpayserver/dogecoin | 1.14.4 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.4/Dogecoin/1.14.4/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | | groestlcoin/docker-groestlcoin | 2.21.1 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | | groestlcoin/lightning | v0.10.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.10.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f6e8891fd..16039bf20 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-1/contrib/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.10.1-1" +echo "Building btcpayserver/lightning:v0.10.1-2" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.10.1-1 +git checkout basedon-v0.10.1-2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.1-1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.1-2" . cd - && cd .. @@ -110,18 +110,18 @@ cd - && cd .. # Build c-lightning-rest -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/amd64.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm32v7.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.4/arm64v8.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building saubyk/c-lightning-rest:0.4.4" +echo "Building saubyk/c-lightning-rest:0.5.2" git clone https://github.com/Ride-The-Lightning/c-lightning-REST c-lightning-rest cd c-lightning-rest -git checkout v0.4.4 +git checkout v0.5.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.4.4" . +docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.5.2" . cd - && cd .. @@ -290,14 +290,14 @@ cd - && cd .. # Build dogecoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.3/Dogecoin/1.14.3/linuxamd64.Dockerfile -DOCKERFILE="Dogecoin/1.14.3/linuxamd64.Dockerfile" -echo "Building btcpayserver/dogecoin:1.14.3" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.4/Dogecoin/1.14.4/linuxamd64.Dockerfile +DOCKERFILE="Dogecoin/1.14.4/linuxamd64.Dockerfile" +echo "Building btcpayserver/dogecoin:1.14.4" git clone https://github.com/btcpayserver/dockerfile-deps dogecoin cd dogecoin -git checkout Dogecoin/1.14.3 +git checkout Dogecoin/1.14.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/dogecoin:1.14.3" . +docker build -f "$DOCKERFILE" -t "btcpayserver/dogecoin:1.14.4" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index fa7473de6..9682ae442 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -57,9 +57,8 @@ services: - "9737" clightning_bitcoin_rest: - image: saubyk/c-lightning-rest:0.4.4 + image: saubyk/c-lightning-rest:0.5.2 restart: unless-stopped - stop_signal: SIGKILL environment: PROTOCOL: "http" NODE: clightning_bitcoin:9835 From caf31976c3c0b7fae1eb5828603f97ad0faf0238 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sun, 26 Sep 2021 14:44:07 +0900 Subject: [PATCH 065/134] bump btcpay --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0f3cdd325..d7a652974 100644 --- a/README.md +++ b/README.md @@ -339,7 +339,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.2.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.10 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 16039bf20..95a3839e4 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.3/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.3$?" +echo "Building btcpayserver/btcpayserver:1.2.4$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.3 +git checkout v1.2.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.3$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.4$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index e39bf76c7..41033fb19 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.2.3$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.2.4$?} expose: - "49392" environment: From 33fd9d2ffcfbaaf8dba54d566ebc63b8ce194598 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Mon, 27 Sep 2021 13:41:09 +0200 Subject: [PATCH 066/134] Revert "Provide plugin directory for Clightning" (#535) --- .../docker-fragments/bitcoin-clightning.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 9682ae442..ba49f6104 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -14,11 +14,9 @@ services: LIGHTNINGD_READY_FILE: /root/.nbxplorer/btc_fully_synched LIGHTNINGD_OPT: | bitcoin-datadir=/etc/bitcoin - bitcoin-rpcconnect=bitcoind - plugin-dir=/etc/clightningplugins + bitcoin-rpcconnect=bitcoind volumes: - "clightning_bitcoin_datadir:/root/.lightning" - - "clightning_bitcoin_plugindir:/etc/clightningplugins" - "bitcoin_datadir:/etc/bitcoin" - "nbxplorer_datadir:/root/.nbxplorer" ports: @@ -111,7 +109,6 @@ services: - clightning_bitcoin volumes: clightning_bitcoin_datadir: - clightning_bitcoin_plugindir: clightning_bitcoin_spark: clightning_bitcoin_charge: clightning_bitcoin_rtl_datadir: From 611da529bf955f26b582228f63e1a398c6d79d69 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 28 Sep 2021 12:45:21 +0900 Subject: [PATCH 067/134] Bump Bitcoin core --- README.md | 4 ++-- contrib/build-all-images.sh | 22 +++++++++---------- .../docker-fragments/bitcoin.yml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d7a652974..6009ed25a 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | -| btcpayserver/bitcoin | 0.21.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | +| btcpayserver/bitcoin | 22.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | @@ -350,7 +350,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.4.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| postgres | 9.6.20 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | +| postgres | 13.3 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 95a3839e4..fcc9dc5ec 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -202,18 +202,18 @@ cd - && cd .. # Build bitcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxamd64.Dockerfile -DOCKERFILE="Bitcoin/0.21.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/0.21.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.21.1/Bitcoin/0.21.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/0.21.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:0.21.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile +DOCKERFILE="Bitcoin/22.0/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/bitcoin:22.0" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/0.21.1 +git checkout Bitcoin/22.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:0.21.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0" . cd - && cd .. @@ -994,12 +994,12 @@ DOCKERFILE="9.6/Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="9.6/Dockerfile" # https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="9.6/Dockerfile" -echo "Building postgres:9.6.20" +echo "Building postgres:13.3" git clone https://github.com/docker-library/postgres postgres cd postgres git checkout b7cb3c6eacea93be2259381033be3cc435649369 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "postgres:9.6.20" . +docker build -f "$DOCKERFILE" -t "postgres:13.3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index b0b63e871..9c6b5af18 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -4,7 +4,7 @@ services: bitcoind: restart: unless-stopped container_name: btcpayserver_bitcoind - image: btcpayserver/bitcoin:0.21.1 + image: btcpayserver/bitcoin:22.0 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_WALLETDIR: "/walletdata" From 65a37e25098f6be949304572a8a6ec916ce97a12 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 13 Sep 2021 18:43:34 +0900 Subject: [PATCH 068/134] Add joinmarket support --- README.md | 4 +- contrib/DockerFileBuildHelper/Program.cs | 6 + contrib/build-all-images.sh | 16 ++- .../docker-fragments/opt-add-joinmarket.yml | 43 ++++++ docs/joinmarket.md | 117 ++++++++++++++++ helpers.sh | 1 + jm.sh | 132 ++++++++++++++++++ 7 files changed, 316 insertions(+), 3 deletions(-) create mode 100644 docker-compose-generator/docker-fragments/opt-add-joinmarket.yml create mode 100644 docs/joinmarket.md create mode 100755 jm.sh diff --git a/README.md b/README.md index 6009ed25a..6835d2699 100644 --- a/README.md +++ b/README.md @@ -183,6 +183,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-zammad](docker-compose-generator/docker-fragments/opt-add-zammad.yml) for [Zammad](https://zammad.com/features), a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails * [opt-monero-expose](docker-compose-generator/docker-fragments/opt-monero-expose.yml) to expose monero node's RPC port at 127.0.0.1:18081 to connect your own wallet. Use f.e. ssh port forwarding to forward to your own computer. * [opt-add-fireflyiii](docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml) ([See the documentation](docs/fireflyiii.md)) +* [opt-add-joinmarket](docker-compose-generator/docker-fragments/opt-add-joinmarket.yml) ([See the documentation](docs/joinmarket.md)) You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file). @@ -347,10 +348,11 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | +| btcpayserver/joinmarket | 0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.4.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| postgres | 13.3 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | +| postgres | 9.6.20 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 647a5f8bd..005fb729e 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -246,6 +246,12 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitRef = $"EPS/{image.Tag}"; dockerInfo.SupportedByUs = true; break; + case "joinmarket": + dockerInfo.DockerFilePath = $"JoinMarket/{NoRevision(image.Tag)}/linuxamd64.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"JoinMarket/{image.Tag}"; + dockerInfo.SupportedByUs = true; + break; case "btglnd": dockerInfo.DockerFilePath = "Dockerfile"; dockerInfo.GitLink = "https://github.com/vutov/lnd"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index fcc9dc5ec..4e39c644e 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -689,6 +689,18 @@ docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. +# Build joinmarket +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile +DOCKERFILE="JoinMarket/0.9.1/linuxamd64.Dockerfile" +echo "Building btcpayserver/joinmarket:0.9.1" +git clone https://github.com/btcpayserver/dockerfile-deps joinmarket +cd joinmarket +git checkout JoinMarket/0.9.1 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.1" . +cd - && cd .. + + # Build librepatron # https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile DOCKERFILE="Dockerfile" @@ -994,12 +1006,12 @@ DOCKERFILE="9.6/Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="9.6/Dockerfile" # https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="9.6/Dockerfile" -echo "Building postgres:13.3" +echo "Building postgres:9.6.20" git clone https://github.com/docker-library/postgres postgres cd postgres git checkout b7cb3c6eacea93be2259381033be3cc435649369 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "postgres:13.3" . +docker build -f "$DOCKERFILE" -t "postgres:9.6.20" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml new file mode 100644 index 000000000..df46fbf45 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml @@ -0,0 +1,43 @@ +version: "3" + +services: + joinmarket: + container_name: joinmarket + image: btcpayserver/joinmarket:0.9.1 + restart: 'no' + environment: + READY_FILE: /root/.nbxplorer/btc_fully_synched + ENSURE_WALLET: 1 + jm_gaplimit: 2000 + jm_tor_control_host: tor + jm_tor_control_port: 9051 + jm_onion_socks5_host: tor + jm_onion_socks5_port: 9050 + jm_socks5_host: tor + jm_socks5_port: 9050 + jm_network: ${NBITCOIN_NETWORK:-regtest} + jm_rpc_host: bitcoind + jm_rpc_port: 43782 + jm_rpc_user: joinmarket + jm_rpc_password: afixedpasswordforjoinmarket + volumes: + - "joinmarket_datadir:/root/.joinmarket" + - "nbxplorer_datadir:/root/.nbxplorer" + - "tor_datadir:/home/tor/.tor" + links: + - bitcoind + + bitcoind: + environment: + BITCOIN_EXTRA_ARGS: | + # rpcuser=joinmarket + # rpcpassword=afixedpasswordforjoinmarket + # We need to use rpcauth because we also need cookieauth. rpcpassword disabled cookie file auth. + # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped. + rpcauth=joinmarket:4b4dbcb712557eb8c8bfd56a2b6a7707$$6497d80877f10dc375829724f369f546b070fc706121a361438a4a1e51025bea + +volumes: + joinmarket_datadir: + +required: + - "opt-add-tor" diff --git a/docs/joinmarket.md b/docs/joinmarket.md new file mode 100644 index 000000000..05ecb14e5 --- /dev/null +++ b/docs/joinmarket.md @@ -0,0 +1,117 @@ +# Joinmarket support + +JoinMarket is software to create a special kind of bitcoin transaction called a CoinJoin transaction. Its aim is to improve the confidentiality and privacy of bitcoin transactions. + +You will be able to use your bitcoin to help other protect their privacy, while earning a yield for this service. + +See [the documentation of the joinmarket project](https://github.com/JoinMarket-Org/JoinMarket-Docs/blob/master/High-level-design.md) for more details. + +This is a very advanced functionality, and there is no easy way to recover if something goes wrong. + +For hardcore bitcoiners only. + +## How to use + +```bash +BTCPAYGEN_ADDITIONAL_FRAGMENTS="$BTCPAYGEN_ADDITIONAL_FRAGMENTS;opt-add-joinmarket" +. btcpay-setup.sh -i +``` + +Then you need to setup your joinmarket wallet: + +```bash +jm.sh wallet-tool-generate +jm.sh set-wallet +``` + +Once done, you will need to send some money to the joinmarket wallet: + +```bash +jm.sh wallet-tool +``` + +## How to fine tune? + +In the [README](../README.md), follow the instruction in `How can I customize the generated docker-compose file?`. +Then pass as environment variable the attribute you want to modify, prefixed by `jm_`. + +Our system is using the default configuration of joinmarket, then replace the values your specify like this. + +Example: + +```yml +services: + joinmarket: + environment: + jm_gaplimit: 3000 + jm_txfee: 300 + jm_cjfee_a: 500 +``` + +## Managing your wallet + +By running `jm.sh` without parameter, you will get a bunch of command that you can run such as: + +For example: +``` +Usage: +------ + +Tooling to setup your joinmarket yield generator + + exec: Run the specified joinmarket script + wallet-tool: Run wallet-tools.py on the wallet + wallet-tool-generate: Generate a new wallet + set-wallet: Set the wallet that the yield generator need to use + logs: See logs of the yield generator (add -f to follow the logs) + bash: Open an interactive bash session in the joinmarket container + receive-payjoin: Receive a payjoin payment (this will stop the yield generator until the payment is received) + sendpayment: Send a payjoin through coinjoin (password needed, this will stop the yield generator until the payment is received) + start: Start the yield generator (started by default) + stop: Stop the yield generator + +Example: + * jm.sh wallet-tool-generate + * jm.sh set-wallet wallet.jmdat mypassword + * jm.sh wallet-tool + * jm.sh receive-payjoin + * jm.sh sendpayment
+ * jm.sh wallet-tool history + * jm.sh logs -f + * jm.sh bash + * jm.sh start + * jm.sh stop +``` + +Note `jm.sh` commands are wrapper around joinmarket scripts. Those wrapper makes your life easier by: +1. Avoiding, when it can, that you enter wallet file name/ wallet password +2. Stop and Start the yield generator for the duration of the operation + +In some cases you might want to get access to the raw scripts of joinmarket, in which case, you need to get the command prompt into the container. + +## Getting command prompt into the container + +You can connect to the container and have direct access to joinmarket scripts such as: + +```bash +jm.sh bash +sendpayment.py wallet.jmdat ... +``` + +However, you might get the following error: + +``` +Failed to load wallet, error message: RetryableStorageError('File is currently in use (locked by pid 12822). If this is a leftover from a crashed instance you need to remove the lock file `/root/.joinmarket/wallets/.wallet.jmdat.lock` manually.') +``` + +This is because the yield generator is running. + +You can stop and start the yield generator with the helper scripts in the container `stop.sh` and `start.sh`. + + +## Troubleshooting + +Run `jm.sh logs` to get the logs of the yield generator. + +A common issue is that a lock file is present, preventing it to restart. +In which case, connect directly into the container with `jm.sh bash` and delete the problematic file. \ No newline at end of file diff --git a/helpers.sh b/helpers.sh index f175f2da7..c0f55eedb 100755 --- a/helpers.sh +++ b/helpers.sh @@ -18,6 +18,7 @@ install_tooling() { "btcpayserver_trezarcoind" "trezarcoin-cli.sh" "Command line for your Trezar instance" \ "btcpayserver_viacoind" "viacoin-cli.sh" "Command line for your Viacoin instance" \ "btcpayserver_elementsd" "elements-cli.sh" "Command line for your Elements/Liquid instance" \ + "joinmarket" "jm.sh" "Command line for your joinmarket instance" \ "ndlci_cli" "ndlc-cli.sh" "Command line for NDLC-CLI" \ "pihole" "pihole.sh" "Command line for running pihole commands" \ "*" "btcpay-clean.sh" "Command line for deleting old unused docker images" \ diff --git a/jm.sh b/jm.sh new file mode 100755 index 000000000..8fa4e5e8d --- /dev/null +++ b/jm.sh @@ -0,0 +1,132 @@ +#!/bin/bash + +function display_help () { +cat <<-END +Usage: +------ + +Tooling to setup your joinmarket yield generator + + exec: Run the specified joinmarket script + wallet-tool: Run wallet-tools.py on the wallet + wallet-tool-generate: Generate a new wallet + set-wallet: Set the wallet that the yield generator need to use + logs: See logs of the yield generator (add -f to follow the logs) + bash: Open an interactive bash session in the joinmarket container + receive-payjoin: Receive a payjoin payment (this will stop the yield generator until the payment is received) + sendpayment: Send a payjoin through coinjoin (password needed, this will stop the yield generator until the payment is received) + start: Start the yield generator (started by default) + stop: Stop the yield generator + +Example: + * jm.sh wallet-tool-generate + * jm.sh set-wallet wallet.jmdat mypassword + * jm.sh wallet-tool + * jm.sh receive-payjoin + * jm.sh sendpayment
+ * jm.sh wallet-tool history + * jm.sh logs -f + * jm.sh bash + * jm.sh start + * jm.sh stop + +See https://github.com/btcpayserver/btcpayserver-docker/tree/master/docs/joinmarket.md for more information. +END +} + +while (( "$#" )); do + case "$1" in + exec) + CMD="$1" + shift 1 + break; + ;; + logs) + CMD="$1" + shift 1 + break; + ;; + bash) + CMD="$1" + shift 1 + break; + ;; + wallet-tool) + CMD="$1" + shift 1 + break; + ;; + set-wallet) + CMD="$1" + shift 1 + break; + ;; + receive-payjoin) + CMD="$1" + shift 1 + break; + ;; + sendpayment) + CMD="$1" + shift 1 + break; + ;; + start) + CMD="$1" + shift 1 + break; + ;; + stop) + CMD="$1" + shift 1 + break; + ;; + wallet-tool-generate) + CMD="$1" + shift 1 + break; + ;; + --) # end argument parsing + shift + break + ;; + -*|--*=) # unsupported flags + echo "Error: Unsupported flag $1" >&2 + display_help + return + ;; + *) # preserve positional arguments + PARAMS="$PARAMS $1" + shift + ;; + esac +done + +if ! [[ "$CMD" ]]; then + display_help +else + if [[ "$CMD" == "wallet-tool" ]]; then + docker exec joinmarket wallet-tool.sh "$@" + elif [[ "$CMD" == "wallet-tool-generate" ]]; then + docker exec -ti joinmarket exec-wrapper.sh wallet-tool.py generate "$@" + elif [[ "$CMD" == "sendpayment" ]]; then + docker exec -ti joinmarket exec-wrapper.sh sendpayment.sh "$@" + elif [[ "$CMD" == "receive-payjoin" ]]; then + docker exec -ti joinmarket exec-wrapper.sh receive-payjoin.sh "$@" + elif [[ "$CMD" == "set-wallet" ]]; then + docker exec joinmarket set-wallet.sh "$@" + docker restart joinmarket + elif [[ "$CMD" == "exec" ]]; then + docker exec joinmarket exec-wrapper.sh "$@" + elif [[ "$CMD" == "logs" ]]; then + docker logs "$@" joinmarket + elif [[ "$CMD" == "bash" ]]; then + docker exec -ti joinmarket exec-wrapper.sh bash "$@" + elif [[ "$CMD" == "stop" ]]; then + docker exec joinmarket exec-wrapper.sh stop.sh + elif [[ "$CMD" == "start" ]]; then + docker exec joinmarket exec-wrapper.sh start.sh + else + display_help + fi +fi From 97a18ecbf861dd7786dbff3e7b70b15012ea5f8f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 29 Sep 2021 11:30:40 +0900 Subject: [PATCH 069/134] Activate gzip --- Production/nginx.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index db5328746..e8ce48e32 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -194,7 +194,9 @@ map $scheme $proxy_x_forwarded_ssl { https on; } -gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; +gzip on; +gzip_min_length 1000; +gzip_types image/svg+xml text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; log_format vhost '$host $remote_addr - $remote_user [$time_local] ' '"$request" $status $body_bytes_sent ' From 97414993dcbccdf27ef2a0a4e24800df159522cc Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 12 Jun 2021 22:28:55 +0900 Subject: [PATCH 070/134] Upgrade postgres --- .../postgres/migrate-docker-entrypoint.sh | 50 +++++++++++++++++++ .../docker-fragments/postgres.yml | 5 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100755 Generated/postgres/migrate-docker-entrypoint.sh diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh new file mode 100755 index 000000000..b5b38a82e --- /dev/null +++ b/Generated/postgres/migrate-docker-entrypoint.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +set -Eeo pipefail +shopt -s extglob + +CURRENT_PGVERSION="" +EXPECTED_PGVERSION="$PG_MAJOR" +if [[ -f "/var/lib/postgresql/data/PG_VERSION" ]]; then + CURRENT_PGVERSION="$(cat /var/lib/postgresql/data/PG_VERSION)" +fi + +if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ + [[ "$CURRENT_PGVERSION" != "" ]]; then + sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list + apt-get update && apt-get install -y --no-install-recommends \ + postgresql-$CURRENT_PGVERSION \ + postgresql-contrib-$CURRENT_PGVERSION \ + && rm -rf /var/lib/apt/lists/* + + export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" + export PGDATABASE="/var/lib/postgresql/data" + export PGDATAOLD="/var/lib/postgresql/data/$CURRENT_PGVERSION" + export PGDATANEW="/var/lib/postgresql/data/$EXPECTED_PGVERSION" + + mkdir -p "$PGDATANEW" "$PGDATAOLD" + find "$PGDATABASE" -maxdepth 1 -mindepth 1 \ + -not -wholename "$PGDATAOLD" \ + -not -wholename "$PGDATANEW" \ + -exec mv {} "$PGDATAOLD/" \; + + chmod 700 "$PGDATAOLD" "$PGDATANEW" + chown postgres . + chown -R postgres "$PGDATAOLD" "$PGDATANEW" "$PGDATABASE" + if [ ! -s "$PGDATANEW/PG_VERSION" ]; then + PGDATA="$PGDATANEW" eval "gosu postgres initdb $POSTGRES_INITDB_ARGS" + fi + + gosu postgres pg_upgrade + rm $PGDATANEW/*.conf + mv $PGDATANEW/* "$PGDATABASE" + mv $PGDATAOLD/*.conf "$PGDATABASE" + rm -r "$PGDATANEW" + ./delete_old_cluster.sh + rm ./analyze_new_cluster.sh +fi + +if [ -f "docker-entrypoint.sh" ]; then + exec ./docker-entrypoint.sh "$@" +else + exec docker-entrypoint.sh "$@" +fi \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index 163aedf31..9e05783ed 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,11 +3,14 @@ version: "3" services: postgres: restart: unless-stopped - image: postgres:9.6.20 + image: postgres:13.4 + entrypoint: ./migrate-docker-entrypoint.sh + command: postgres environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: - "postgres_datadir:/var/lib/postgresql/data" + - "./postgres/migrate-docker-entrypoint.sh:/migrate-docker-entrypoint.sh:ro" volumes: postgres_datadir: From 91d33b513ae243cba066b0c47f95c7dbf84f0dbe Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Thu, 30 Sep 2021 11:12:48 +0200 Subject: [PATCH 071/134] Fix firefly link --- docs/fireflyiii.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fireflyiii.md b/docs/fireflyiii.md index f05efcd3c..9ece32152 100644 --- a/docs/fireflyiii.md +++ b/docs/fireflyiii.md @@ -1,6 +1,6 @@ # Firefly III support -[Firefly III](https://pi-hole.net/) is a self-hosted financial manager. +[Firefly III](https://www.firefly-iii.org/) is a self-hosted financial manager. It can help you keep track of expenses, income, budgets and everything in between. It supports credit cards, shared household accounts and savings accounts. It’s pretty fancy. You should use it to save and organise money. ## How to use From 54bd6eedef96497608f8d1dea9ea2d2b4b98c738 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Thu, 30 Sep 2021 11:13:12 +0200 Subject: [PATCH 072/134] Fix instructions link for docs --- docs/joinmarket.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/joinmarket.md b/docs/joinmarket.md index 05ecb14e5..c18bb4e08 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -32,7 +32,7 @@ jm.sh wallet-tool ## How to fine tune? -In the [README](../README.md), follow the instruction in `How can I customize the generated docker-compose file?`. +Follow the [How can I customize the generated docker-compose file?](https://github.com/btcpayserver/btcpayserver-docker/blob/master/README.md#how-can-i-customize-the-generated-docker-compose-file) instructions. Then pass as environment variable the attribute you want to modify, prefixed by `jm_`. Our system is using the default configuration of joinmarket, then replace the values your specify like this. From 81a17317e1aa0420dd12c5bc63ab6fd9fdb9a583 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Thu, 30 Sep 2021 11:13:38 +0200 Subject: [PATCH 073/134] Fix video link and preview image for docs --- docs/ndlc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ndlc.md b/docs/ndlc.md index a6128c712..a2b97bdfa 100644 --- a/docs/ndlc.md +++ b/docs/ndlc.md @@ -25,7 +25,7 @@ The `Contract Execution Transaction` (or `CET`) is the transaction distributing The following documentation is also explained in this video. -[](https://youtu.be/DakwshnNkho) +[![How to make a DLC with NDLC-CLI](https://img.youtube.com/vi/DakwshnNkho/mqdefault.jpg)](https://www.youtube.com/watch?v=DakwshnNkho) ## How to use From 3c98599e6090477ca8af0b3d44edfe4c2613136b Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Thu, 30 Sep 2021 11:14:08 +0200 Subject: [PATCH 074/134] Markdown formatting --- docs/fireflyiii.md | 1 + docs/joinmarket.md | 5 +++-- docs/ndlc.md | 3 ++- docs/pihole.md | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/fireflyiii.md b/docs/fireflyiii.md index 9ece32152..f1e8f4b91 100644 --- a/docs/fireflyiii.md +++ b/docs/fireflyiii.md @@ -15,4 +15,5 @@ FIREFLY_HOST="firefly.yourserver.org" . btcpay-setup.sh -i . ./Tools/fireflyiii/init.sh ``` + 4. Access Firefly III at `firefly.yourserver.org` and create your admin account. diff --git a/docs/joinmarket.md b/docs/joinmarket.md index c18bb4e08..8b036ccdb 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -53,6 +53,7 @@ services: By running `jm.sh` without parameter, you will get a bunch of command that you can run such as: For example: + ``` Usage: ------ @@ -84,6 +85,7 @@ Example: ``` Note `jm.sh` commands are wrapper around joinmarket scripts. Those wrapper makes your life easier by: + 1. Avoiding, when it can, that you enter wallet file name/ wallet password 2. Stop and Start the yield generator for the duration of the operation @@ -108,10 +110,9 @@ This is because the yield generator is running. You can stop and start the yield generator with the helper scripts in the container `stop.sh` and `start.sh`. - ## Troubleshooting Run `jm.sh logs` to get the logs of the yield generator. A common issue is that a lock file is present, preventing it to restart. -In which case, connect directly into the container with `jm.sh bash` and delete the problematic file. \ No newline at end of file +In which case, connect directly into the container with `jm.sh bash` and delete the problematic file. diff --git a/docs/ndlc.md b/docs/ndlc.md index a2b97bdfa..bc96110ac 100644 --- a/docs/ndlc.md +++ b/docs/ndlc.md @@ -16,6 +16,7 @@ The `oracle` roles is to define the `event` and `attest` a single outcome of the Let's call Alice and Bob the two parties of the contract, and Olivia the oracle. A DLC will show two transactions on the chain: + * The Funding Transaction * The Contract Execution Transaction (CET) @@ -42,4 +43,4 @@ You can then use `ndlc-cli.sh` to run use ndlc-cli, for example: ndlc.sh oracle generate MyOwnOracle ``` -Read our documentation on our [github repository](https://github.com/dgarage/NDLC/blob/master/docs/Concepts.md). \ No newline at end of file +Read our documentation on our [GitHub repository](https://github.com/dgarage/NDLC/blob/master/docs/Concepts.md). diff --git a/docs/pihole.md b/docs/pihole.md index bc2c876c3..2a500c07c 100644 --- a/docs/pihole.md +++ b/docs/pihole.md @@ -42,12 +42,14 @@ docker logs pihole | grep random ``` If the password does not work, you can try to reset the password: + ```bash pihole.sh -a -p docker restart pihole ``` Then running again + ```bash docker logs pihole | grep random ``` From d321c09ba0db79bf6f151f9811a115b2fac358fc Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 30 Sep 2021 19:58:15 +0900 Subject: [PATCH 075/134] Revert "Upgrade postgres" This reverts commit 97414993dcbccdf27ef2a0a4e24800df159522cc. --- .../postgres/migrate-docker-entrypoint.sh | 50 ------------------- .../docker-fragments/postgres.yml | 5 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100755 Generated/postgres/migrate-docker-entrypoint.sh diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh deleted file mode 100755 index b5b38a82e..000000000 --- a/Generated/postgres/migrate-docker-entrypoint.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash -set -Eeo pipefail -shopt -s extglob - -CURRENT_PGVERSION="" -EXPECTED_PGVERSION="$PG_MAJOR" -if [[ -f "/var/lib/postgresql/data/PG_VERSION" ]]; then - CURRENT_PGVERSION="$(cat /var/lib/postgresql/data/PG_VERSION)" -fi - -if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ - [[ "$CURRENT_PGVERSION" != "" ]]; then - sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list - apt-get update && apt-get install -y --no-install-recommends \ - postgresql-$CURRENT_PGVERSION \ - postgresql-contrib-$CURRENT_PGVERSION \ - && rm -rf /var/lib/apt/lists/* - - export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" - export PGDATABASE="/var/lib/postgresql/data" - export PGDATAOLD="/var/lib/postgresql/data/$CURRENT_PGVERSION" - export PGDATANEW="/var/lib/postgresql/data/$EXPECTED_PGVERSION" - - mkdir -p "$PGDATANEW" "$PGDATAOLD" - find "$PGDATABASE" -maxdepth 1 -mindepth 1 \ - -not -wholename "$PGDATAOLD" \ - -not -wholename "$PGDATANEW" \ - -exec mv {} "$PGDATAOLD/" \; - - chmod 700 "$PGDATAOLD" "$PGDATANEW" - chown postgres . - chown -R postgres "$PGDATAOLD" "$PGDATANEW" "$PGDATABASE" - if [ ! -s "$PGDATANEW/PG_VERSION" ]; then - PGDATA="$PGDATANEW" eval "gosu postgres initdb $POSTGRES_INITDB_ARGS" - fi - - gosu postgres pg_upgrade - rm $PGDATANEW/*.conf - mv $PGDATANEW/* "$PGDATABASE" - mv $PGDATAOLD/*.conf "$PGDATABASE" - rm -r "$PGDATANEW" - ./delete_old_cluster.sh - rm ./analyze_new_cluster.sh -fi - -if [ -f "docker-entrypoint.sh" ]; then - exec ./docker-entrypoint.sh "$@" -else - exec docker-entrypoint.sh "$@" -fi \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index 9e05783ed..163aedf31 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,14 +3,11 @@ version: "3" services: postgres: restart: unless-stopped - image: postgres:13.4 - entrypoint: ./migrate-docker-entrypoint.sh - command: postgres + image: postgres:9.6.20 environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: - "postgres_datadir:/var/lib/postgresql/data" - - "./postgres/migrate-docker-entrypoint.sh:/migrate-docker-entrypoint.sh:ro" volumes: postgres_datadir: From 9e534b4324e760988e47118795c99651d422a9ab Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 30 Sep 2021 20:50:37 +0900 Subject: [PATCH 076/134] Revert "Revert "Upgrade postgres"" This reverts commit d321c09ba0db79bf6f151f9811a115b2fac358fc. --- .../postgres/migrate-docker-entrypoint.sh | 50 +++++++++++++++++++ .../docker-fragments/postgres.yml | 5 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100755 Generated/postgres/migrate-docker-entrypoint.sh diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh new file mode 100755 index 000000000..b5b38a82e --- /dev/null +++ b/Generated/postgres/migrate-docker-entrypoint.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +set -Eeo pipefail +shopt -s extglob + +CURRENT_PGVERSION="" +EXPECTED_PGVERSION="$PG_MAJOR" +if [[ -f "/var/lib/postgresql/data/PG_VERSION" ]]; then + CURRENT_PGVERSION="$(cat /var/lib/postgresql/data/PG_VERSION)" +fi + +if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ + [[ "$CURRENT_PGVERSION" != "" ]]; then + sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list + apt-get update && apt-get install -y --no-install-recommends \ + postgresql-$CURRENT_PGVERSION \ + postgresql-contrib-$CURRENT_PGVERSION \ + && rm -rf /var/lib/apt/lists/* + + export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" + export PGDATABASE="/var/lib/postgresql/data" + export PGDATAOLD="/var/lib/postgresql/data/$CURRENT_PGVERSION" + export PGDATANEW="/var/lib/postgresql/data/$EXPECTED_PGVERSION" + + mkdir -p "$PGDATANEW" "$PGDATAOLD" + find "$PGDATABASE" -maxdepth 1 -mindepth 1 \ + -not -wholename "$PGDATAOLD" \ + -not -wholename "$PGDATANEW" \ + -exec mv {} "$PGDATAOLD/" \; + + chmod 700 "$PGDATAOLD" "$PGDATANEW" + chown postgres . + chown -R postgres "$PGDATAOLD" "$PGDATANEW" "$PGDATABASE" + if [ ! -s "$PGDATANEW/PG_VERSION" ]; then + PGDATA="$PGDATANEW" eval "gosu postgres initdb $POSTGRES_INITDB_ARGS" + fi + + gosu postgres pg_upgrade + rm $PGDATANEW/*.conf + mv $PGDATANEW/* "$PGDATABASE" + mv $PGDATAOLD/*.conf "$PGDATABASE" + rm -r "$PGDATANEW" + ./delete_old_cluster.sh + rm ./analyze_new_cluster.sh +fi + +if [ -f "docker-entrypoint.sh" ]; then + exec ./docker-entrypoint.sh "$@" +else + exec docker-entrypoint.sh "$@" +fi \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index 163aedf31..9e05783ed 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,11 +3,14 @@ version: "3" services: postgres: restart: unless-stopped - image: postgres:9.6.20 + image: postgres:13.4 + entrypoint: ./migrate-docker-entrypoint.sh + command: postgres environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: - "postgres_datadir:/var/lib/postgresql/data" + - "./postgres/migrate-docker-entrypoint.sh:/migrate-docker-entrypoint.sh:ro" volumes: postgres_datadir: From 57a21629fed046490eaf0ac85726a5c20d71435f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 1 Oct 2021 13:05:29 +0900 Subject: [PATCH 077/134] Warning --- docs/joinmarket.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/joinmarket.md b/docs/joinmarket.md index 8b036ccdb..0799b4009 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -1,5 +1,7 @@ # Joinmarket support +EXPERIMENTAL JOINMARKET SUPPORT IS SUBJECT TO CHANGE + JoinMarket is software to create a special kind of bitcoin transaction called a CoinJoin transaction. Its aim is to improve the confidentiality and privacy of bitcoin transactions. You will be able to use your bitcoin to help other protect their privacy, while earning a yield for this service. From 069be073e0d00005716ebbe35b372096f3de0253 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 1 Oct 2021 14:26:24 +0900 Subject: [PATCH 078/134] Use supervisord for joinmarket --- Production/nginx.tmpl | 7 ++ .../docker-fragments/opt-add-joinmarket.yml | 2 + docs/joinmarket.md | 110 +++++++++++------- jm.sh | 24 +--- 4 files changed, 83 insertions(+), 60 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index e8ce48e32..af5f2391a 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -39,6 +39,13 @@ proxy_pass http://bitcoin_rtl:3000/rtl/; } {{ end }} + + {{ if (eq $serviceName "joinmarket") }} + location /obwatch/ { + proxy_pass http://joinmarket:62601/; + } + {{ end }} + {{ if (eq $serviceName "bitcoin_thub") }} location /thub { proxy_pass http://bitcoin_thub:3000/thub; diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml index df46fbf45..c7b908071 100644 --- a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml +++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml @@ -24,6 +24,8 @@ services: - "joinmarket_datadir:/root/.joinmarket" - "nbxplorer_datadir:/root/.nbxplorer" - "tor_datadir:/home/tor/.tor" + expose: + - 62601 links: - bitcoind diff --git a/docs/joinmarket.md b/docs/joinmarket.md index 0799b4009..2db909cf8 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -1,7 +1,5 @@ # Joinmarket support -EXPERIMENTAL JOINMARKET SUPPORT IS SUBJECT TO CHANGE - JoinMarket is software to create a special kind of bitcoin transaction called a CoinJoin transaction. Its aim is to improve the confidentiality and privacy of bitcoin transactions. You will be able to use your bitcoin to help other protect their privacy, while earning a yield for this service. @@ -19,7 +17,7 @@ BTCPAYGEN_ADDITIONAL_FRAGMENTS="$BTCPAYGEN_ADDITIONAL_FRAGMENTS;opt-add-joinmark . btcpay-setup.sh -i ``` -Then you need to setup your joinmarket wallet: +Then you need to setup your default joinmarket wallet: ```bash jm.sh wallet-tool-generate @@ -32,46 +30,31 @@ Once done, you will need to send some money to the joinmarket wallet: jm.sh wallet-tool ``` -## How to fine tune? - -Follow the [How can I customize the generated docker-compose file?](https://github.com/btcpayserver/btcpayserver-docker/blob/master/README.md#how-can-i-customize-the-generated-docker-compose-file) instructions. -Then pass as environment variable the attribute you want to modify, prefixed by `jm_`. - -Our system is using the default configuration of joinmarket, then replace the values your specify like this. +## How to change joinmarket configuration? -Example: +Connect to your container, and edit your configuration: -```yml -services: - joinmarket: - environment: - jm_gaplimit: 3000 - jm_txfee: 300 - jm_cjfee_a: 500 +```bash +jm.sh bash +vim $CONFIG ``` ## Managing your wallet By running `jm.sh` without parameter, you will get a bunch of command that you can run such as: -For example: - ``` Usage: ------ Tooling to setup your joinmarket yield generator - exec: Run the specified joinmarket script wallet-tool: Run wallet-tools.py on the wallet wallet-tool-generate: Generate a new wallet set-wallet: Set the wallet that the yield generator need to use - logs: See logs of the yield generator (add -f to follow the logs) bash: Open an interactive bash session in the joinmarket container receive-payjoin: Receive a payjoin payment (this will stop the yield generator until the payment is received) sendpayment: Send a payjoin through coinjoin (password needed, this will stop the yield generator until the payment is received) - start: Start the yield generator (started by default) - stop: Stop the yield generator Example: * jm.sh wallet-tool-generate @@ -80,18 +63,10 @@ Example: * jm.sh receive-payjoin * jm.sh sendpayment
* jm.sh wallet-tool history - * jm.sh logs -f * jm.sh bash - * jm.sh start - * jm.sh stop ``` -Note `jm.sh` commands are wrapper around joinmarket scripts. Those wrapper makes your life easier by: - -1. Avoiding, when it can, that you enter wallet file name/ wallet password -2. Stop and Start the yield generator for the duration of the operation - -In some cases you might want to get access to the raw scripts of joinmarket, in which case, you need to get the command prompt into the container. +Note `jm.sh` commands are wrapper around joinmarket scripts. Those are just convenience command, you can always directly connect to the container via `jm.sh bash` and achieve the same result with the joinmarket python scripts. ## Getting command prompt into the container @@ -102,19 +77,76 @@ jm.sh bash sendpayment.py wallet.jmdat ... ``` -However, you might get the following error: +## Managing the services such as yield generators +First connect to the container's bash + +```bash +jm.sh bash ``` -Failed to load wallet, error message: RetryableStorageError('File is currently in use (locked by pid 12822). If this is a leftover from a crashed instance you need to remove the lock file `/root/.joinmarket/wallets/.wallet.jmdat.lock` manually.') +You can list available services to run: + +```bash +supervisorctl status +``` + +Which might show you + +```bash +root> supervisorctl status +ob-watcher STOPPED Not started +yg-privacyenhanced STOPPED Not started +yield-generator-basic STOPPED Not started +``` + +You can start a yield generator with: + +```bash +supervisorctl start yg-privacyenhanced ``` -This is because the yield generator is running. +*** Note that services will NOT be restarted automatically if the container restart. *** -You can stop and start the yield generator with the helper scripts in the container `stop.sh` and `start.sh`. +## OB-Watcher + +The `ob-watcher` service allows you to [see an order book](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/docs/orderbook.md). + +You can activate it: + +```bash +supervisorctl start ob-watcher +``` + +Then you can browse it by browsing `https://.com/obwatch/` ## Troubleshooting -Run `jm.sh logs` to get the logs of the yield generator. +### Error: Failed to load wallet, you need to remove the lock file + +You might sometimes get the following error when running a python script for joinmarket: + +``` +Failed to load wallet, error message: RetryableStorageError('File is currently in use (locked by pid 12822). If this is a leftover from a crashed instance you need to remove the lock file `/root/.joinmarket/wallets/.wallet.jmdat.lock` manually.') +``` + +This is because a service using the wallet is running, so you need to shut it down before running the command. + +Check which service is running: +```bash +supervisorctl status +``` + +And stop it + +```bash +supervisorctl stop yg-privacyenhanced +``` + +### Read the logs of services + +You can use the `supervisorctl tail` command: +```bash +supervisorctl tail yg-privacyenhanced +``` -A common issue is that a lock file is present, preventing it to restart. -In which case, connect directly into the container with `jm.sh bash` and delete the problematic file. +You can also check the logs in the `$DATADIR/logs` folder. diff --git a/jm.sh b/jm.sh index 8fa4e5e8d..def270364 100755 --- a/jm.sh +++ b/jm.sh @@ -71,16 +71,6 @@ while (( "$#" )); do shift 1 break; ;; - start) - CMD="$1" - shift 1 - break; - ;; - stop) - CMD="$1" - shift 1 - break; - ;; wallet-tool-generate) CMD="$1" shift 1 @@ -106,26 +96,18 @@ if ! [[ "$CMD" ]]; then display_help else if [[ "$CMD" == "wallet-tool" ]]; then - docker exec joinmarket wallet-tool.sh "$@" + docker exec joinmarket exec-wrapper.sh unlockwallet wallet-tool.py "$@" elif [[ "$CMD" == "wallet-tool-generate" ]]; then docker exec -ti joinmarket exec-wrapper.sh wallet-tool.py generate "$@" elif [[ "$CMD" == "sendpayment" ]]; then - docker exec -ti joinmarket exec-wrapper.sh sendpayment.sh "$@" + docker exec -ti joinmarket exec-wrapper.sh unlockwallet nopass sendpayment.py "$@" elif [[ "$CMD" == "receive-payjoin" ]]; then - docker exec -ti joinmarket exec-wrapper.sh receive-payjoin.sh "$@" + docker exec -ti joinmarket exec-wrapper.sh unlockwallet receive-payjoin.py "$@" elif [[ "$CMD" == "set-wallet" ]]; then docker exec joinmarket set-wallet.sh "$@" docker restart joinmarket - elif [[ "$CMD" == "exec" ]]; then - docker exec joinmarket exec-wrapper.sh "$@" - elif [[ "$CMD" == "logs" ]]; then - docker logs "$@" joinmarket elif [[ "$CMD" == "bash" ]]; then docker exec -ti joinmarket exec-wrapper.sh bash "$@" - elif [[ "$CMD" == "stop" ]]; then - docker exec joinmarket exec-wrapper.sh stop.sh - elif [[ "$CMD" == "start" ]]; then - docker exec joinmarket exec-wrapper.sh start.sh else display_help fi From 5dc207409bb9b8f385d9d7821f1c04c11c489b0a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 1 Oct 2021 16:26:29 +0900 Subject: [PATCH 079/134] Fix jm.sh doc --- jm.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/jm.sh b/jm.sh index def270364..b4414affb 100755 --- a/jm.sh +++ b/jm.sh @@ -7,16 +7,12 @@ Usage: Tooling to setup your joinmarket yield generator - exec: Run the specified joinmarket script wallet-tool: Run wallet-tools.py on the wallet wallet-tool-generate: Generate a new wallet set-wallet: Set the wallet that the yield generator need to use - logs: See logs of the yield generator (add -f to follow the logs) bash: Open an interactive bash session in the joinmarket container receive-payjoin: Receive a payjoin payment (this will stop the yield generator until the payment is received) sendpayment: Send a payjoin through coinjoin (password needed, this will stop the yield generator until the payment is received) - start: Start the yield generator (started by default) - stop: Stop the yield generator Example: * jm.sh wallet-tool-generate @@ -25,10 +21,7 @@ Example: * jm.sh receive-payjoin * jm.sh sendpayment
* jm.sh wallet-tool history - * jm.sh logs -f * jm.sh bash - * jm.sh start - * jm.sh stop See https://github.com/btcpayserver/btcpayserver-docker/tree/master/docs/joinmarket.md for more information. END @@ -36,16 +29,6 @@ END while (( "$#" )); do case "$1" in - exec) - CMD="$1" - shift 1 - break; - ;; - logs) - CMD="$1" - shift 1 - break; - ;; bash) CMD="$1" shift 1 From 478b4c26b2f1e7c83c8b311584eacf2a30bbecb5 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 1 Oct 2021 16:27:21 +0900 Subject: [PATCH 080/134] Fix doc --- docs/joinmarket.md | 4 ++-- jm.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/joinmarket.md b/docs/joinmarket.md index 2db909cf8..08688f43a 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -53,8 +53,8 @@ Tooling to setup your joinmarket yield generator wallet-tool-generate: Generate a new wallet set-wallet: Set the wallet that the yield generator need to use bash: Open an interactive bash session in the joinmarket container - receive-payjoin: Receive a payjoin payment (this will stop the yield generator until the payment is received) - sendpayment: Send a payjoin through coinjoin (password needed, this will stop the yield generator until the payment is received) + receive-payjoin: Receive a payjoin payment + sendpayment: Send a payjoin through coinjoin (password needed) Example: * jm.sh wallet-tool-generate diff --git a/jm.sh b/jm.sh index b4414affb..d31706e79 100755 --- a/jm.sh +++ b/jm.sh @@ -11,8 +11,8 @@ Tooling to setup your joinmarket yield generator wallet-tool-generate: Generate a new wallet set-wallet: Set the wallet that the yield generator need to use bash: Open an interactive bash session in the joinmarket container - receive-payjoin: Receive a payjoin payment (this will stop the yield generator until the payment is received) - sendpayment: Send a payjoin through coinjoin (password needed, this will stop the yield generator until the payment is received) + receive-payjoin: Receive a payjoin payment + sendpayment: Send a payjoin through coinjoin (password needed) Example: * jm.sh wallet-tool-generate From 1585bc3a90bfe4b854ab7d8083275a4bf5953f33 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 1 Oct 2021 16:28:48 +0900 Subject: [PATCH 081/134] Fix doc --- docs/joinmarket.md | 4 ++-- jm.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/joinmarket.md b/docs/joinmarket.md index 08688f43a..0ed49d87e 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -60,8 +60,8 @@ Example: * jm.sh wallet-tool-generate * jm.sh set-wallet wallet.jmdat mypassword * jm.sh wallet-tool - * jm.sh receive-payjoin - * jm.sh sendpayment
+ * jm.sh receive-payjoin + * jm.sh sendpayment
* jm.sh wallet-tool history * jm.sh bash ``` diff --git a/jm.sh b/jm.sh index d31706e79..a7a1fa9f1 100755 --- a/jm.sh +++ b/jm.sh @@ -18,8 +18,8 @@ Example: * jm.sh wallet-tool-generate * jm.sh set-wallet wallet.jmdat mypassword * jm.sh wallet-tool - * jm.sh receive-payjoin - * jm.sh sendpayment
+ * jm.sh receive-payjoin + * jm.sh sendpayment
* jm.sh wallet-tool history * jm.sh bash From 360cff9a02919858a1b0b7b963d4bf870d2fa2ba Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 1 Oct 2021 22:20:05 +0900 Subject: [PATCH 082/134] Handle postgres migration for old install --- .../postgres/migrate-docker-entrypoint.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 Production/postgres/migrate-docker-entrypoint.sh diff --git a/Production/postgres/migrate-docker-entrypoint.sh b/Production/postgres/migrate-docker-entrypoint.sh new file mode 100755 index 000000000..b5b38a82e --- /dev/null +++ b/Production/postgres/migrate-docker-entrypoint.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +set -Eeo pipefail +shopt -s extglob + +CURRENT_PGVERSION="" +EXPECTED_PGVERSION="$PG_MAJOR" +if [[ -f "/var/lib/postgresql/data/PG_VERSION" ]]; then + CURRENT_PGVERSION="$(cat /var/lib/postgresql/data/PG_VERSION)" +fi + +if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ + [[ "$CURRENT_PGVERSION" != "" ]]; then + sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list + apt-get update && apt-get install -y --no-install-recommends \ + postgresql-$CURRENT_PGVERSION \ + postgresql-contrib-$CURRENT_PGVERSION \ + && rm -rf /var/lib/apt/lists/* + + export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" + export PGDATABASE="/var/lib/postgresql/data" + export PGDATAOLD="/var/lib/postgresql/data/$CURRENT_PGVERSION" + export PGDATANEW="/var/lib/postgresql/data/$EXPECTED_PGVERSION" + + mkdir -p "$PGDATANEW" "$PGDATAOLD" + find "$PGDATABASE" -maxdepth 1 -mindepth 1 \ + -not -wholename "$PGDATAOLD" \ + -not -wholename "$PGDATANEW" \ + -exec mv {} "$PGDATAOLD/" \; + + chmod 700 "$PGDATAOLD" "$PGDATANEW" + chown postgres . + chown -R postgres "$PGDATAOLD" "$PGDATANEW" "$PGDATABASE" + if [ ! -s "$PGDATANEW/PG_VERSION" ]; then + PGDATA="$PGDATANEW" eval "gosu postgres initdb $POSTGRES_INITDB_ARGS" + fi + + gosu postgres pg_upgrade + rm $PGDATANEW/*.conf + mv $PGDATANEW/* "$PGDATABASE" + mv $PGDATAOLD/*.conf "$PGDATABASE" + rm -r "$PGDATANEW" + ./delete_old_cluster.sh + rm ./analyze_new_cluster.sh +fi + +if [ -f "docker-entrypoint.sh" ]; then + exec ./docker-entrypoint.sh "$@" +else + exec docker-entrypoint.sh "$@" +fi \ No newline at end of file From 6cc3583205911ead811529cebfc0fe125f2949c3 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 2 Oct 2021 12:31:06 +0900 Subject: [PATCH 083/134] Do not parse settings.json --- docker-compose-generator/docker-fragments/bitcoin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 9c6b5af18..6060a14df 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -18,6 +18,7 @@ services: port=39388 whitelist=0.0.0.0/0 maxmempool=500 + settings=false expose: - "43782" - "39388" From c6d45bfa0430d053a79dfdf8f11ed0bfcde763d2 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 2 Oct 2021 13:17:08 +0900 Subject: [PATCH 084/134] Fix postgres update for arm32 --- .../postgres/migrate-docker-entrypoint.sh | 21 +++++++++++++++---- .../postgres/migrate-docker-entrypoint.sh | 21 +++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh index b5b38a82e..6557a6694 100755 --- a/Generated/postgres/migrate-docker-entrypoint.sh +++ b/Generated/postgres/migrate-docker-entrypoint.sh @@ -11,10 +11,23 @@ fi if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ [[ "$CURRENT_PGVERSION" != "" ]]; then sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list - apt-get update && apt-get install -y --no-install-recommends \ - postgresql-$CURRENT_PGVERSION \ - postgresql-contrib-$CURRENT_PGVERSION \ - && rm -rf /var/lib/apt/lists/* + apt-get update + if ! apt-get install -y --no-install-recommends \ + postgresql-$CURRENT_PGVERSION \ + postgresql-contrib-$CURRENT_PGVERSION; then + # On arm32, postgres doesn't ship those packages, so we download + # the binaries from an archive we built from the postgres 9.6.20 image's binaries + FALLBACK="https://aois.blob.core.windows.net/public/$CURRENT_PGVERSION-$(uname -m).tar.gz" + echo "Failure to install postgresql-$CURRENT_PGVERSION and postgresql-contrib-$CURRENT_PGVERSION trying fallback $FALLBACK" + apt-get install -y wget + pushd . > /dev/null + cd /usr/lib/postgresql + wget $FALLBACK + tar -xvf *.tar.gz + rm -f *.tar.gz + popd > /dev/null + echo "Successfully installed PG utilities via the fallback" + fi export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" export PGDATABASE="/var/lib/postgresql/data" diff --git a/Production/postgres/migrate-docker-entrypoint.sh b/Production/postgres/migrate-docker-entrypoint.sh index b5b38a82e..6557a6694 100755 --- a/Production/postgres/migrate-docker-entrypoint.sh +++ b/Production/postgres/migrate-docker-entrypoint.sh @@ -11,10 +11,23 @@ fi if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ [[ "$CURRENT_PGVERSION" != "" ]]; then sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list - apt-get update && apt-get install -y --no-install-recommends \ - postgresql-$CURRENT_PGVERSION \ - postgresql-contrib-$CURRENT_PGVERSION \ - && rm -rf /var/lib/apt/lists/* + apt-get update + if ! apt-get install -y --no-install-recommends \ + postgresql-$CURRENT_PGVERSION \ + postgresql-contrib-$CURRENT_PGVERSION; then + # On arm32, postgres doesn't ship those packages, so we download + # the binaries from an archive we built from the postgres 9.6.20 image's binaries + FALLBACK="https://aois.blob.core.windows.net/public/$CURRENT_PGVERSION-$(uname -m).tar.gz" + echo "Failure to install postgresql-$CURRENT_PGVERSION and postgresql-contrib-$CURRENT_PGVERSION trying fallback $FALLBACK" + apt-get install -y wget + pushd . > /dev/null + cd /usr/lib/postgresql + wget $FALLBACK + tar -xvf *.tar.gz + rm -f *.tar.gz + popd > /dev/null + echo "Successfully installed PG utilities via the fallback" + fi export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" export PGDATABASE="/var/lib/postgresql/data" From 5b82a9a6ae6feb1efba10bd035dfd94cff865f3a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 2 Oct 2021 20:43:31 +0900 Subject: [PATCH 085/134] Fix postgres update for arm7 --- Generated/postgres/migrate-docker-entrypoint.sh | 5 +++++ Production/postgres/migrate-docker-entrypoint.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh index 6557a6694..f574ec8f6 100755 --- a/Generated/postgres/migrate-docker-entrypoint.sh +++ b/Generated/postgres/migrate-docker-entrypoint.sh @@ -18,6 +18,7 @@ if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ # On arm32, postgres doesn't ship those packages, so we download # the binaries from an archive we built from the postgres 9.6.20 image's binaries FALLBACK="https://aois.blob.core.windows.net/public/$CURRENT_PGVERSION-$(uname -m).tar.gz" + FALLBACK_SHARE="https://aois.blob.core.windows.net/public/share-$CURRENT_PGVERSION-$(uname -m).tar.gz" echo "Failure to install postgresql-$CURRENT_PGVERSION and postgresql-contrib-$CURRENT_PGVERSION trying fallback $FALLBACK" apt-get install -y wget pushd . > /dev/null @@ -25,6 +26,10 @@ if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ wget $FALLBACK tar -xvf *.tar.gz rm -f *.tar.gz + cd /usr/share/postgresql + wget $FALLBACK_SHARE + tar -xvf *.tar.gz + rm -f *.tar.gz popd > /dev/null echo "Successfully installed PG utilities via the fallback" fi diff --git a/Production/postgres/migrate-docker-entrypoint.sh b/Production/postgres/migrate-docker-entrypoint.sh index 6557a6694..f574ec8f6 100755 --- a/Production/postgres/migrate-docker-entrypoint.sh +++ b/Production/postgres/migrate-docker-entrypoint.sh @@ -18,6 +18,7 @@ if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ # On arm32, postgres doesn't ship those packages, so we download # the binaries from an archive we built from the postgres 9.6.20 image's binaries FALLBACK="https://aois.blob.core.windows.net/public/$CURRENT_PGVERSION-$(uname -m).tar.gz" + FALLBACK_SHARE="https://aois.blob.core.windows.net/public/share-$CURRENT_PGVERSION-$(uname -m).tar.gz" echo "Failure to install postgresql-$CURRENT_PGVERSION and postgresql-contrib-$CURRENT_PGVERSION trying fallback $FALLBACK" apt-get install -y wget pushd . > /dev/null @@ -25,6 +26,10 @@ if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ wget $FALLBACK tar -xvf *.tar.gz rm -f *.tar.gz + cd /usr/share/postgresql + wget $FALLBACK_SHARE + tar -xvf *.tar.gz + rm -f *.tar.gz popd > /dev/null echo "Successfully installed PG utilities via the fallback" fi From 384a0a903807fbc8a432feb449cd37019a7dd9f6 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sun, 3 Oct 2021 01:01:22 +0900 Subject: [PATCH 086/134] Add documentation if postgres update fail on rapsberry pi 4 --- Generated/postgres/migrate-docker-entrypoint.sh | 5 ++++- Production/postgres/migrate-docker-entrypoint.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh index f574ec8f6..9b410d2b2 100755 --- a/Generated/postgres/migrate-docker-entrypoint.sh +++ b/Generated/postgres/migrate-docker-entrypoint.sh @@ -11,7 +11,10 @@ fi if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ [[ "$CURRENT_PGVERSION" != "" ]]; then sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list - apt-get update + if ! apt-get update; then + echo "apt-get update failed. Are you using raspberry pi 4? If yes, please follow https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/" + exit 1 + fi if ! apt-get install -y --no-install-recommends \ postgresql-$CURRENT_PGVERSION \ postgresql-contrib-$CURRENT_PGVERSION; then diff --git a/Production/postgres/migrate-docker-entrypoint.sh b/Production/postgres/migrate-docker-entrypoint.sh index f574ec8f6..9b410d2b2 100755 --- a/Production/postgres/migrate-docker-entrypoint.sh +++ b/Production/postgres/migrate-docker-entrypoint.sh @@ -11,7 +11,10 @@ fi if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ [[ "$CURRENT_PGVERSION" != "" ]]; then sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list - apt-get update + if ! apt-get update; then + echo "apt-get update failed. Are you using raspberry pi 4? If yes, please follow https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/" + exit 1 + fi if ! apt-get install -y --no-install-recommends \ postgresql-$CURRENT_PGVERSION \ postgresql-contrib-$CURRENT_PGVERSION; then From c7eb720dd5acf71a463fd80e201e173f5135a298 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sun, 3 Oct 2021 10:55:41 +0900 Subject: [PATCH 087/134] Update woocommerce --- README.md | 4 ++-- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/opt-add-woocommerce.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6835d2699..da444dcdd 100644 --- a/README.md +++ b/README.md @@ -352,7 +352,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.4.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| postgres | 9.6.20 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | +| postgres | 13.4 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | @@ -383,7 +383,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | dennisreimann/tallycoin_connect | v1.4.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | -| btcpayserver/docker-woocommerce | 3.0.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | +| btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | | memcached | 1.5.22-alpine | [✔️](https://raw.githubusercontent.com/docker-library/memcached/master/alpine/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/memcached) - [DockerHub](https://hub.docker.com/_/memcached) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 4e39c644e..de31e761d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -880,14 +880,14 @@ cd - && cd .. # Build docker-woocommerce -# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.12/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/docker-woocommerce:3.0.12" +echo "Building btcpayserver/docker-woocommerce:3.0.14" git clone https://github.com/btcpayserver/docker-woocommerce docker-woocommerce cd docker-woocommerce -git checkout v3.0.12 +git checkout v3.0.14 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.12" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.14" . cd - && cd .. @@ -1006,12 +1006,12 @@ DOCKERFILE="9.6/Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="9.6/Dockerfile" # https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="9.6/Dockerfile" -echo "Building postgres:9.6.20" +echo "Building postgres:13.4" git clone https://github.com/docker-library/postgres postgres cd postgres git checkout b7cb3c6eacea93be2259381033be3cc435649369 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "postgres:9.6.20" . +docker build -f "$DOCKERFILE" -t "postgres:13.4" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml index b164751e6..4aaac6d76 100644 --- a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml +++ b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml @@ -2,7 +2,7 @@ version: '3' services: woocommerce: - image: btcpayserver/docker-woocommerce:3.0.12 + image: btcpayserver/docker-woocommerce:3.0.14 environment: WOOCOMMERCE_HOST: ${WOOCOMMERCE_HOST} WORDPRESS_DB_HOST: mariadb From 425ca5880f1967909c3e76fdbd46e9a32a483e48 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sun, 3 Oct 2021 11:13:36 +0900 Subject: [PATCH 088/134] Bump Tor Relay to latest stable release (4.5.9) --- README.md | 2 +- contrib/build-all-images.sh | 18 +++++++++--------- .../docker-fragments/opt-add-tor-relay.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index da444dcdd..9a087e2d4 100644 --- a/README.md +++ b/README.md @@ -351,7 +351,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/joinmarket | 0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | -| btcpayserver/tor | 0.4.4.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | +| btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | postgres | 13.4 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index de31e761d..ae88396c6 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -832,18 +832,18 @@ cd - && cd .. # Build tor -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxamd64.Dockerfile -DOCKERFILE="Tor/0.4.4.7/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.4.7/Tor/0.4.4.7/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.4.7/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/tor:0.4.4.7" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile +DOCKERFILE="Tor/0.4.5.9/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Tor/0.4.5.9/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Tor/0.4.5.9/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/tor:0.4.5.9" git clone https://github.com/btcpayserver/dockerfile-deps tor cd tor -git checkout Tor/0.4.4.7 +git checkout Tor/0.4.5.9 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.4.7" . +docker build -f "$DOCKERFILE" -t "btcpayserver/tor:0.4.5.9" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml index 5869cdacf..8351230fd 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml @@ -17,7 +17,7 @@ services: tor-relay: restart: unless-stopped - image: btcpayserver/tor:0.4.4.7 + image: btcpayserver/tor:0.4.5.9 container_name: tor-relay environment: TOR_PASSWORD: btcpayserver From 915569e49f49c5f636c90061a56daee176cd1427 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 4 Oct 2021 14:58:52 +0900 Subject: [PATCH 089/134] Add joinmarket for arm64 and arm32 --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 2 ++ contrib/build-all-images.sh | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a087e2d4..786ed34f9 100644 --- a/README.md +++ b/README.md @@ -348,7 +348,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | -| btcpayserver/joinmarket | 0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | +| btcpayserver/joinmarket | 0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 005fb729e..1a4b2272c 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -248,6 +248,8 @@ private DockerInfo GetDockerInfo(Image image) break; case "joinmarket": dockerInfo.DockerFilePath = $"JoinMarket/{NoRevision(image.Tag)}/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"JoinMarket/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"JoinMarket/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; dockerInfo.GitRef = $"JoinMarket/{image.Tag}"; dockerInfo.SupportedByUs = true; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ae88396c6..ee2b56e86 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -692,6 +692,10 @@ cd - && cd .. # Build joinmarket # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile DOCKERFILE="JoinMarket/0.9.1/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="JoinMarket/0.9.1/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="JoinMarket/0.9.1/linuxarm64v8.Dockerfile" echo "Building btcpayserver/joinmarket:0.9.1" git clone https://github.com/btcpayserver/dockerfile-deps joinmarket cd joinmarket From 4df7243b4d8e9d7c68605a95c4c0b7b832c35624 Mon Sep 17 00:00:00 2001 From: d11n Date: Mon, 4 Oct 2021 08:48:50 +0200 Subject: [PATCH 090/134] Improve NDLC disclaimer (#538) --- docs/ndlc.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/ndlc.md b/docs/ndlc.md index bc96110ac..c1b07c207 100644 --- a/docs/ndlc.md +++ b/docs/ndlc.md @@ -1,8 +1,11 @@ # NDLC support -DISCLAIMER: THIS PROJECT IS EXPERIMENTAL BASED ON A PROTOCOL WHICH IS STILL EVOLVING EVERYDAY. USE WITH CAUTION. +:::danger Disclaimer +This project is experimental and based on a protocol which is still evolving everyday. +Use with caution. -I WILL TAKE NO ATTEMPT AT MAINTAINING BACKWARD COMPATIBILITY AT THIS STAGE. +I will take no attempt at maintaining backwards compatibility at this stage. +::: ## Introduction From 3721c651d6320d1cee058b7ea55c191398a894f9 Mon Sep 17 00:00:00 2001 From: xpayserver <67416048+xpayserver@users.noreply.github.com> Date: Mon, 4 Oct 2021 08:52:53 +0200 Subject: [PATCH 091/134] Add chatwoot support system (#353) Co-authored-by: Andrew Camilleri --- .gitignore | 1 + README.md | 1 + btcpay-setup.sh | 2 + .../docker-fragments/opt-add-chatwoot.yml | 70 +++++++++++++++++++ docs/chatwoot.md | 32 +++++++++ helpers.sh | 1 + 6 files changed, 107 insertions(+) create mode 100644 docker-compose-generator/docker-fragments/opt-add-chatwoot.yml create mode 100644 docs/chatwoot.md diff --git a/.gitignore b/.gitignore index 1e8d83c4b..edec872c9 100644 --- a/.gitignore +++ b/.gitignore @@ -299,6 +299,7 @@ Production/.env Generated/acme.json Generated/traefik_logs/ +Generated/chatwoot_config.env Generated/error diff --git a/README.md b/README.md index 786ed34f9..97e04773a 100644 --- a/README.md +++ b/README.md @@ -180,6 +180,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/djbooth007/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann). * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin). * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect. +* [opt-add-chatwoot](docker-compose-generator/docker-fragments/opt-add-chatwoot.yml) for open source chat support system. ([See the documentation](docs/chatwoot.md)) * [opt-add-zammad](docker-compose-generator/docker-fragments/opt-add-zammad.yml) for [Zammad](https://zammad.com/features), a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails * [opt-monero-expose](docker-compose-generator/docker-fragments/opt-monero-expose.yml) to expose monero node's RPC port at 127.0.0.1:18081 to connect your own wallet. Use f.e. ssh port forwarding to forward to your own computer. * [opt-add-fireflyiii](docker-compose-generator/docker-fragments/opt-add-fireflyiii.yml) ([See the documentation](docs/fireflyiii.md)) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 10198e580..24db2bed0 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -107,6 +107,7 @@ Add-on specific variables: BTCTRANSMUTER_HOST: If btc transmuter is activated with opt-add-btctransmuter, the hostname of your btc transmuter website (eg. store.example.com) TOR_RELAY_NICKNAME: If tor relay is activated with opt-add-tor-relay, the relay nickname TOR_RELAY_EMAIL: If tor relay is activated with opt-add-tor-relay, the email for Tor to contact you regarding your relay + CHATWOOT_HOST: If chatwoot is activated with opt-add-chatwoot, the hostname of your chatwoot website (eg. store.example.com) FIREFLY_HOST: If fireflyiii is activated with opt-add-fireflyiii, the hostname of your libre patron website (eg. firefly.example.com) END } @@ -287,6 +288,7 @@ LIBREPATRON_HOST:$LIBREPATRON_HOST ZAMMAD_HOST:$ZAMMAD_HOST WOOCOMMERCE_HOST:$WOOCOMMERCE_HOST BTCTRANSMUTER_HOST:$BTCTRANSMUTER_HOST +CHATWOOT_HOST:$CHATWOOT_HOST BTCPAY_ENABLE_SSH:$BTCPAY_ENABLE_SSH BTCPAY_HOST_SSHKEYFILE:$BTCPAY_HOST_SSHKEYFILE LETSENCRYPT_EMAIL:$LETSENCRYPT_EMAIL diff --git a/docker-compose-generator/docker-fragments/opt-add-chatwoot.yml b/docker-compose-generator/docker-fragments/opt-add-chatwoot.yml new file mode 100644 index 000000000..025abedad --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-chatwoot.yml @@ -0,0 +1,70 @@ +version: "3" + +services: + chatwoot: + image: chatwoot/chatwoot:v1.7.0 + restart: unless-stopped + container_name: chatwoot + env_file: chatwoot-config.env + environment: + FRONTEND_URL: ${BTCPAY_PROTOCOL:-https}://${CHATWOOT_HOST} + FORCE_SSL: "true" + REDIS_URL: redis://redis:6379 + POSTGRES_HOST: postgres + POSTGRES_USERNAME: postgres + RAILS_ENV: production + NODE_ENV: production + RAILS_MAX_THREADS: 5 + REDIS_PASSWORD: "" + RAILS_LOG_TO_STDOUT: "true" + LOG_LEVEL: info + LOG_SIZE: 500 + IOS_APP_ID: 6C953F3RX2.com.chatwoot.app + LETSENCRYPT_HOST: ${CHATWOOT_HOST} + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} + VIRTUAL_HOST: ${CHATWOOT_HOST} + VIRTUAL_HOST_NAME: "chatwoot" + VIRTUAL_PORT: 3000 + expose: + - "3000" + depends_on: + - postgres + - redis + entrypoint: docker/entrypoints/rails.sh + command: "bundle exec rails s -p 3000 -b 0.0.0.0" + + chatwoot_sidekiq: + image: chatwoot/chatwoot:v1.7.0 + restart: unless-stopped + env_file: chatwoot-config.env + environment: + FRONTEND_URL: ${BTCPAY_PROTOCOL:-https}://${CHATWOOT_HOST} + FORCE_SSL: "true" + REDIS_URL: redis://redis:6379 + POSTGRES_HOST: postgres + POSTGRES_USERNAME: postgres + RAILS_ENV: production + NODE_ENV: production + RAILS_MAX_THREADS: 5 + REDIS_PASSWORD: "" + RAILS_LOG_TO_STDOUT: "true" + LOG_LEVEL: info + LOG_SIZE: 500 + IOS_APP_ID: 6C953F3RX2.com.chatwoot.app + depends_on: + - postgres + - redis + command: "bundle exec sidekiq -C config/sidekiq.yml" + redis: + image: redis:5.0.2-alpine + restart: unless-stopped + expose: + - "6379" + volumes: + - "redis_datadir:/data" + btcpayserver: + environment: + BTCPAY_EXTERNALSERVICES: "Chatwoot:${BTCPAY_PROTOCOL:-https}://${CHATWOOT_HOST};" + +volumes: + redis_datadir: \ No newline at end of file diff --git a/docs/chatwoot.md b/docs/chatwoot.md new file mode 100644 index 000000000..370634dec --- /dev/null +++ b/docs/chatwoot.md @@ -0,0 +1,32 @@ +# Chatwoot support + +[Chatwoot](https://www.chatwoot.com/) is a customer support tool for instant messaging channels which can help businesses provide exceptional customer support. + +## How to use + +1. Connect as root to your server +2. create chatwoot configuration file where `{CONFIG DATA HERE}` is replaced by settings from [here](https://www.chatwoot.com/docs/environment-variables) + +```bash +sudo su - +cd btcpayserver-docker +cat >> Generated/chatwoot-config.env < Date: Tue, 5 Oct 2021 14:19:58 +0200 Subject: [PATCH 092/134] Bump transmuter --- .../docker-fragments/opt-add-btctransmuter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml index 34ed3d192..33ad02ead 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml @@ -3,7 +3,7 @@ version: "3" services: btctransmuter: restart: unless-stopped - image: btcpayserver/btctransmuter:0.0.57 + image: btcpayserver/btctransmuter:0.0.58 container_name: btctransmuter environment: TRANSMUTER_Database: User ID=postgres;Host=postgres;Port=5432;Database=btctransmuter${NBITCOIN_NETWORK:-regtest} From e3b7d57868de70f2f1641eda89961bd14be83a0c Mon Sep 17 00:00:00 2001 From: Kukks Date: Wed, 6 Oct 2021 15:34:56 +0200 Subject: [PATCH 093/134] Revert "Bump transmuter" This reverts commit 82803987b3ba8d2c1a4d3dc3a196952b489371e5. --- .../docker-fragments/opt-add-btctransmuter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml index 33ad02ead..34ed3d192 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml @@ -3,7 +3,7 @@ version: "3" services: btctransmuter: restart: unless-stopped - image: btcpayserver/btctransmuter:0.0.58 + image: btcpayserver/btctransmuter:0.0.57 container_name: btctransmuter environment: TRANSMUTER_Database: User ID=postgres;Host=postgres;Port=5432;Database=btctransmuter${NBITCOIN_NETWORK:-regtest} From a092054f862d861505ade60c5bb1ca0599ea26a5 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 8 Oct 2021 11:05:26 +0900 Subject: [PATCH 094/134] bump bitcoin core 22.0, fix issue about corrupt settings.json --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin.yml | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 97e04773a..fd56fb565 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | -| btcpayserver/bitcoin | 22.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | +| btcpayserver/bitcoin | 22.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ee2b56e86..f45f5fff3 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -202,18 +202,18 @@ cd - && cd .. # Build bitcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile DOCKERFILE="Bitcoin/22.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:22.0" +echo "Building btcpayserver/bitcoin:22.0-1" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/22.0 +git checkout Bitcoin/22.0-1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0-1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 6060a14df..e32e552d7 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -4,7 +4,7 @@ services: bitcoind: restart: unless-stopped container_name: btcpayserver_bitcoind - image: btcpayserver/bitcoin:22.0 + image: btcpayserver/bitcoin:22.0-1 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_WALLETDIR: "/walletdata" @@ -18,7 +18,6 @@ services: port=39388 whitelist=0.0.0.0/0 maxmempool=500 - settings=false expose: - "43782" - "39388" From dcf0e554b4da7722d43299485bca834dbc6af977 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 8 Oct 2021 11:06:55 +0900 Subject: [PATCH 095/134] Revert "bump bitcoin core 22.0, fix issue about corrupt settings.json" This reverts commit a092054f862d861505ade60c5bb1ca0599ea26a5. --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin.yml | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fd56fb565..97e04773a 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | -| btcpayserver/bitcoin | 22.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | +| btcpayserver/bitcoin | 22.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f45f5fff3..ee2b56e86 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -202,18 +202,18 @@ cd - && cd .. # Build bitcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile DOCKERFILE="Bitcoin/22.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:22.0-1" +echo "Building btcpayserver/bitcoin:22.0" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/22.0-1 +git checkout Bitcoin/22.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0-1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index e32e552d7..6060a14df 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -4,7 +4,7 @@ services: bitcoind: restart: unless-stopped container_name: btcpayserver_bitcoind - image: btcpayserver/bitcoin:22.0-1 + image: btcpayserver/bitcoin:22.0 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_WALLETDIR: "/walletdata" @@ -18,6 +18,7 @@ services: port=39388 whitelist=0.0.0.0/0 maxmempool=500 + settings=false expose: - "43782" - "39388" From daa889dc2a9cc5b79e522d5a3bc1591f87ed20ea Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 8 Oct 2021 12:13:21 +0900 Subject: [PATCH 096/134] Revert "Revert "bump bitcoin core 22.0, fix issue about corrupt settings.json"" This reverts commit dcf0e554b4da7722d43299485bca834dbc6af977. --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin.yml | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 97e04773a..fd56fb565 100644 --- a/README.md +++ b/README.md @@ -333,7 +333,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | -| btcpayserver/bitcoin | 22.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | +| btcpayserver/bitcoin | 22.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ee2b56e86..f45f5fff3 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -202,18 +202,18 @@ cd - && cd .. # Build bitcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile DOCKERFILE="Bitcoin/22.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0/Bitcoin/22.0/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/22.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:22.0" +echo "Building btcpayserver/bitcoin:22.0-1" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/22.0 +git checkout Bitcoin/22.0-1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:22.0-1" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 6060a14df..e32e552d7 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -4,7 +4,7 @@ services: bitcoind: restart: unless-stopped container_name: btcpayserver_bitcoind - image: btcpayserver/bitcoin:22.0 + image: btcpayserver/bitcoin:22.0-1 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_WALLETDIR: "/walletdata" @@ -18,7 +18,6 @@ services: port=39388 whitelist=0.0.0.0/0 maxmempool=500 - settings=false expose: - "43782" - "39388" From 463410a7723ddbb55cbbbd39e5004004a1c52f7c Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 8 Oct 2021 12:25:45 +0900 Subject: [PATCH 097/134] Remove bitcoin taproot cc --- .../taproot_bip8_lottrue_switch.sh | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh diff --git a/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh b/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh deleted file mode 100644 index 1594fd2ee..000000000 --- a/Tools/bitcointaprootcc_lottrue/taproot_bip8_lottrue_switch.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -if [[ "$0" = "$BASH_SOURCE" ]]; then - echo "This script must be sourced \". taproot_bip8_lottrue_switch.sh\"" - exit 1 -fi - -set -e - -if [[ "$BTCPAYGEN_ADDITIONAL_FRAGMENTS" =~ "bitcointaprootcc-bip8-lottrue" ]]; then - read -p "You are already running bitcointaproot.cc BIP8 taproot node release. Type 'bitcoin_core' to change back to the Bitcoin Core release `echo $'\n> '`" yn - if [ $yn != "bitcoin_core" ]; then - exit 0 - fi - export BTCPAYGEN_ADDITIONAL_FRAGMENTS="${BTCPAYGEN_ADDITIONAL_FRAGMENTS//bitcointaprootcc-bip8-lottrue/}" - export BTCPAYGEN_EXCLUDE_FRAGMENTS="${BTCPAYGEN_EXCLUDE_FRAGMENTS//bitcoin;/}" - - . btcpay-setup.sh -i - cd Tools - echo "Configured to use Bitcoin Core release." - exit 0 -fi - - -echo "This script will swap the Bitcoin Core release with a release provided on https://bitcointaproot.cc signed by LukeDashJr and bitcoinmechanicca@protonmail.com with BIP8 LOT=TRUE taproot activation. Additional details can be found on: https://bitcointaproot.cc/#faq_mainline" - -read -p " Type 'bitcointaprootcc-bip8-lottrue' to switch to HTTPS://BITCOINTAPROOT.CC FORK OF BITCOIN CORE. `echo $'\n> '`" yn -if [ $yn != "bitcointaprootcc-bip8-lottrue" ]; then - exit 0 -fi - -export BTCPAYGEN_ADDITIONAL_FRAGMENTS="$BTCPAYGEN_ADDITIONAL_FRAGMENTS;bitcointaprootcc-bip8-lottrue" -export BTCPAYGEN_EXCLUDE_FRAGMENTS="$BTCPAYGEN_EXCLUDE_FRAGMENTS;bitcoin;" - -. btcpay-setup.sh -i -cd Tools -echo "Configured to use https://bitcointaproot.cc release." From 16bb5c5bae150dffda045c2434fe98d4466ee828 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 11 Oct 2021 20:36:33 +0900 Subject: [PATCH 098/134] Bump NBX --- README.md | 3 +- contrib/DockerFileBuildHelper/Program.cs | 6 +++ contrib/build-all-images.sh | 48 ++++++++++++++++--- .../docker-fragments/nbxplorer.yml | 2 +- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fd56fb565..31983165e 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.10 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.12 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | @@ -376,6 +376,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | bluewalletorganization/lndhub | v1.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | shesek/bwt | 0.2.2-electrum | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/bwt-dev/bwt/v0.2.2/docker/arm64v8.Dockerfile) | [Github](https://github.com/bwt-dev/bwt) - [DockerHub](https://hub.docker.com/r/shesek/bwt) | +| chatwoot/chatwoot | v1.7.0 | [✔️](https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/chatwoot/chatwoot) - [DockerHub](https://hub.docker.com/r/chatwoot/chatwoot) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | fireflyiii/core | latest | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [Github](https://dev.azure.com/Firefly-III/_git/MainImage) - [DockerHub](https://hub.docker.com/r/fireflyiii/core) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 1a4b2272c..50650c585 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -299,6 +299,12 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitLink = "https://github.com/Groestlcoin/lightning"; dockerInfo.GitRef = $"{image.Tag}"; break; + case "chatwoot": + dockerInfo.DockerFilePath = $"docker/Dockerfile"; + dockerInfo.GitLink = "https://github.com/chatwoot/chatwoot"; + dockerInfo.GitRef = $"{image.Tag}"; + dockerInfo.SupportedByUs = false; + break; case "lightning-charge": dockerInfo.DockerFilePath = $"Dockerfile"; dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f45f5fff3..2847c518b 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.10/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.10" +echo "Building nicolasdorier/nbxplorer:2.2.12" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.10 +git checkout v2.2.12 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.10" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.12" . cd - && cd .. @@ -629,6 +629,42 @@ docker build -f "$DOCKERFILE" -t "shesek/bwt:0.2.2-electrum" . cd - && cd .. +# Build chatwoot +# https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile +DOCKERFILE="docker/Dockerfile" +echo "Building chatwoot/chatwoot:v1.7.0" +git clone https://github.com/chatwoot/chatwoot chatwoot +cd chatwoot +git checkout v1.7.0 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "chatwoot/chatwoot:v1.7.0" . +cd - && cd .. + + +# Build chatwoot +# https://raw.githubusercontent.com/chatwoot/chatwoot/v1.7.0/docker/Dockerfile +DOCKERFILE="docker/Dockerfile" +echo "Building chatwoot/chatwoot:v1.7.0" +git clone https://github.com/chatwoot/chatwoot chatwoot +cd chatwoot +git checkout v1.7.0 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "chatwoot/chatwoot:v1.7.0" . +cd - && cd .. + + +# Build redis +# https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile +DOCKERFILE="5.0/Dockerfile" +echo "Building redis:5.0.2-alpine" +git clone https://github.com/docker-library/redis redis +cd redis +git checkout f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "redis:5.0.2-alpine" . +cd - && cd .. + + # Build btcpayserver-configurator # https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile DOCKERFILE="Dockerfiles/amd64.Dockerfile" diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index b0138be3d..a0714fbfe 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.10 + image: nicolasdorier/nbxplorer:2.2.12 expose: - "32838" environment: From ed98cf44559e2049d5bf59b4ef14f9a6f741be88 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 20 Oct 2021 11:14:15 +0900 Subject: [PATCH 099/134] Bump joinmarket to fix receive-payjoin --- .../docker-fragments/opt-add-joinmarket.yml | 7 ++++--- jm.sh | 12 +++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml index c7b908071..444f664db 100644 --- a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml +++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml @@ -3,8 +3,8 @@ version: "3" services: joinmarket: container_name: joinmarket - image: btcpayserver/joinmarket:0.9.1 - restart: 'no' + image: btcpayserver/joinmarket:0.9.3-devbtcpay + restart: unless-stopped environment: READY_FILE: /root/.nbxplorer/btc_fully_synched ENSURE_WALLET: 1 @@ -25,7 +25,8 @@ services: - "nbxplorer_datadir:/root/.nbxplorer" - "tor_datadir:/home/tor/.tor" expose: - - 62601 + - 62601 # obwatch + - 8080 # payjoin server links: - bitcoind diff --git a/jm.sh b/jm.sh index a7a1fa9f1..eb7019a53 100755 --- a/jm.sh +++ b/jm.sh @@ -13,6 +13,7 @@ Tooling to setup your joinmarket yield generator bash: Open an interactive bash session in the joinmarket container receive-payjoin: Receive a payjoin payment sendpayment: Send a payjoin through coinjoin (password needed) + reset-config: Reset the configuration to its default value Example: * jm.sh wallet-tool-generate @@ -21,6 +22,7 @@ Example: * jm.sh receive-payjoin * jm.sh sendpayment
* jm.sh wallet-tool history + * jm.sh reset-config * jm.sh bash See https://github.com/btcpayserver/btcpayserver-docker/tree/master/docs/joinmarket.md for more information. @@ -34,6 +36,11 @@ while (( "$#" )); do shift 1 break; ;; + reset-config) + CMD="$1" + shift 1 + break; + ;; wallet-tool) CMD="$1" shift 1 @@ -89,7 +96,10 @@ else elif [[ "$CMD" == "set-wallet" ]]; then docker exec joinmarket set-wallet.sh "$@" docker restart joinmarket - elif [[ "$CMD" == "bash" ]]; then + elif [[ "$CMD" == "reset-config" ]]; then + docker exec -ti joinmarket bash -c 'rm -f "$CONFIG"' + docker restart joinmarket + elif [[ "$CMD" == "bash" ]]; then docker exec -ti joinmarket exec-wrapper.sh bash "$@" else display_help From 8d8c131c14dbb2b16d75ae15a0dd2beddde371bf Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 20 Oct 2021 11:14:15 +0900 Subject: [PATCH 100/134] Bump joinmarket to fix receive-payjoin --- .../docker-fragments/opt-add-joinmarket.yml | 7 ++++--- docs/joinmarket.md | 8 ++++++++ jm.sh | 12 +++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml index c7b908071..444f664db 100644 --- a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml +++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml @@ -3,8 +3,8 @@ version: "3" services: joinmarket: container_name: joinmarket - image: btcpayserver/joinmarket:0.9.1 - restart: 'no' + image: btcpayserver/joinmarket:0.9.3-devbtcpay + restart: unless-stopped environment: READY_FILE: /root/.nbxplorer/btc_fully_synched ENSURE_WALLET: 1 @@ -25,7 +25,8 @@ services: - "nbxplorer_datadir:/root/.nbxplorer" - "tor_datadir:/home/tor/.tor" expose: - - 62601 + - 62601 # obwatch + - 8080 # payjoin server links: - bitcoind diff --git a/docs/joinmarket.md b/docs/joinmarket.md index 0ed49d87e..dbef14aaf 100644 --- a/docs/joinmarket.md +++ b/docs/joinmarket.md @@ -107,6 +107,14 @@ supervisorctl start yg-privacyenhanced *** Note that services will NOT be restarted automatically if the container restart. *** +If you want to automatically restart the service when the container restart, + +```bash +vim $AUTO_START +``` + +Then remove the comment `#` in front of the service name you want to automatically restart. + ## OB-Watcher The `ob-watcher` service allows you to [see an order book](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/docs/orderbook.md). diff --git a/jm.sh b/jm.sh index a7a1fa9f1..eb7019a53 100755 --- a/jm.sh +++ b/jm.sh @@ -13,6 +13,7 @@ Tooling to setup your joinmarket yield generator bash: Open an interactive bash session in the joinmarket container receive-payjoin: Receive a payjoin payment sendpayment: Send a payjoin through coinjoin (password needed) + reset-config: Reset the configuration to its default value Example: * jm.sh wallet-tool-generate @@ -21,6 +22,7 @@ Example: * jm.sh receive-payjoin * jm.sh sendpayment
* jm.sh wallet-tool history + * jm.sh reset-config * jm.sh bash See https://github.com/btcpayserver/btcpayserver-docker/tree/master/docs/joinmarket.md for more information. @@ -34,6 +36,11 @@ while (( "$#" )); do shift 1 break; ;; + reset-config) + CMD="$1" + shift 1 + break; + ;; wallet-tool) CMD="$1" shift 1 @@ -89,7 +96,10 @@ else elif [[ "$CMD" == "set-wallet" ]]; then docker exec joinmarket set-wallet.sh "$@" docker restart joinmarket - elif [[ "$CMD" == "bash" ]]; then + elif [[ "$CMD" == "reset-config" ]]; then + docker exec -ti joinmarket bash -c 'rm -f "$CONFIG"' + docker restart joinmarket + elif [[ "$CMD" == "bash" ]]; then docker exec -ti joinmarket exec-wrapper.sh bash "$@" else display_help From ec8359199e52148e385b6bcbc4b2ada22ee27680 Mon Sep 17 00:00:00 2001 From: d11n Date: Wed, 20 Oct 2021 09:47:47 +0200 Subject: [PATCH 101/134] Upgrade Tallycoin Connect (#541) Now it also supports arm32v7 and arm64v8 architectures. --- README.md | 2 +- contrib/build-all-images.sh | 14 ++++++-------- .../docker-fragments/opt-add-tallycoin-connect.yml | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 31983165e..dc8eaed05 100644 --- a/README.md +++ b/README.md @@ -382,7 +382,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| dennisreimann/tallycoin_connect | v1.4.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| djbooth007/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | ️[✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2847c518b..0c4fc6a41 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -719,7 +719,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -812,14 +812,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.4.0/Dockerfile +# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building dennisreimann/tallycoin_connect:v1.4.0" -git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect +echo "Building djbooth007/tallycoin_connect:v1.7.0" +git clone https://github.com/djbooth007/tallycoin_connect tallycoin_connect cd tallycoin_connect -git checkout v1.4.0 +git checkout v1.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.4.0" . +docker build -f "$DOCKERFILE" -t "djbooth007/tallycoin_connect:v1.7.0" . cd - && cd .. @@ -1089,5 +1089,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml index 1d0834134..bf0feada2 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml @@ -6,7 +6,7 @@ services: volumes: - "tallycoin_connect_datadir:/etc/tallycoin_connect_datadir" tallycoin_connect: - image: "dennisreimann/tallycoin_connect:v1.4.0" + image: "dennisreimann/tallycoin_connect:v1.7.0" restart: unless-stopped expose: - "8123" From 650de8f647d641f5a2981f478a4cb78a2ec4e78f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 20 Oct 2021 16:48:59 +0900 Subject: [PATCH 102/134] update doc --- README.md | 4 ++-- contrib/build-all-images.sh | 30 ++++++++++++++++-------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index dc8eaed05..10c36f774 100644 --- a/README.md +++ b/README.md @@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | -| btcpayserver/joinmarket | 0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | +| btcpayserver/joinmarket | 0.9.3-devbtcpay | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | @@ -382,7 +382,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| djbooth007/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | ️[✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 0c4fc6a41..796bf0d27 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -719,25 +719,25 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. # Build joinmarket -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxamd64.Dockerfile -DOCKERFILE="JoinMarket/0.9.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="JoinMarket/0.9.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.1/JoinMarket/0.9.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="JoinMarket/0.9.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/joinmarket:0.9.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxamd64.Dockerfile +DOCKERFILE="JoinMarket/0.9.3/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="JoinMarket/0.9.3/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="JoinMarket/0.9.3/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/joinmarket:0.9.3-devbtcpay" git clone https://github.com/btcpayserver/dockerfile-deps joinmarket cd joinmarket -git checkout JoinMarket/0.9.1 +git checkout JoinMarket/0.9.3-devbtcpay cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.3-devbtcpay" . cd - && cd .. @@ -812,14 +812,14 @@ cd - && cd .. # Build tallycoin_connect -# https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.0/Dockerfile +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building djbooth007/tallycoin_connect:v1.7.0" -git clone https://github.com/djbooth007/tallycoin_connect tallycoin_connect +echo "Building dennisreimann/tallycoin_connect:v1.7.0" +git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect git checkout v1.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "djbooth007/tallycoin_connect:v1.7.0" . +docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . cd - && cd .. @@ -1089,3 +1089,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + From 8b3f0368a8ae9729c4b4bf895ffd952ecef452e7 Mon Sep 17 00:00:00 2001 From: rockstardev <5191402+rockstardev@users.noreply.github.com> Date: Wed, 20 Oct 2021 08:07:57 -0500 Subject: [PATCH 103/134] Bump LND to v0.13.3-beta (#540) --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin-lnd.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 10c36f774..1df33c696 100644 --- a/README.md +++ b/README.md @@ -339,7 +339,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.5.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.13.1-beta-withloop-fix | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.12 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 796bf0d27..d887e6a3a 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -170,18 +170,18 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.1-beta-withloop-fix/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.13.1-beta-withloop-fix" +echo "Building btcpayserver/lnd:v0.13.3-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.13.1-beta-withloop-fix +git checkout basedon-v0.13.3-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.13.1-beta-withloop-fix" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.13.3-beta" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 1ced94e5c..83ac19eea 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.13.1-beta-withloop-fix + image: btcpayserver/lnd:v0.13.3-beta container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: From b153b8495351c5d7c60f80b43da4f3597e05df35 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 21 Oct 2021 13:38:12 +0900 Subject: [PATCH 104/134] Switch to our own postgres container --- .../postgres/migrate-docker-entrypoint.sh | 71 ------------------- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 10 +-- contrib/build-all-images.sh | 20 +++--- .../docker-fragments/postgres.yml | 5 +- 5 files changed, 17 insertions(+), 91 deletions(-) delete mode 100755 Generated/postgres/migrate-docker-entrypoint.sh diff --git a/Generated/postgres/migrate-docker-entrypoint.sh b/Generated/postgres/migrate-docker-entrypoint.sh deleted file mode 100755 index 9b410d2b2..000000000 --- a/Generated/postgres/migrate-docker-entrypoint.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash -set -Eeo pipefail -shopt -s extglob - -CURRENT_PGVERSION="" -EXPECTED_PGVERSION="$PG_MAJOR" -if [[ -f "/var/lib/postgresql/data/PG_VERSION" ]]; then - CURRENT_PGVERSION="$(cat /var/lib/postgresql/data/PG_VERSION)" -fi - -if [[ "$CURRENT_PGVERSION" != "$EXPECTED_PGVERSION" ]] && \ - [[ "$CURRENT_PGVERSION" != "" ]]; then - sed -i "s/$/ $CURRENT_PGVERSION/" /etc/apt/sources.list.d/pgdg.list - if ! apt-get update; then - echo "apt-get update failed. Are you using raspberry pi 4? If yes, please follow https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/" - exit 1 - fi - if ! apt-get install -y --no-install-recommends \ - postgresql-$CURRENT_PGVERSION \ - postgresql-contrib-$CURRENT_PGVERSION; then - # On arm32, postgres doesn't ship those packages, so we download - # the binaries from an archive we built from the postgres 9.6.20 image's binaries - FALLBACK="https://aois.blob.core.windows.net/public/$CURRENT_PGVERSION-$(uname -m).tar.gz" - FALLBACK_SHARE="https://aois.blob.core.windows.net/public/share-$CURRENT_PGVERSION-$(uname -m).tar.gz" - echo "Failure to install postgresql-$CURRENT_PGVERSION and postgresql-contrib-$CURRENT_PGVERSION trying fallback $FALLBACK" - apt-get install -y wget - pushd . > /dev/null - cd /usr/lib/postgresql - wget $FALLBACK - tar -xvf *.tar.gz - rm -f *.tar.gz - cd /usr/share/postgresql - wget $FALLBACK_SHARE - tar -xvf *.tar.gz - rm -f *.tar.gz - popd > /dev/null - echo "Successfully installed PG utilities via the fallback" - fi - - export PGBINOLD="/usr/lib/postgresql/$CURRENT_PGVERSION/bin" - export PGDATABASE="/var/lib/postgresql/data" - export PGDATAOLD="/var/lib/postgresql/data/$CURRENT_PGVERSION" - export PGDATANEW="/var/lib/postgresql/data/$EXPECTED_PGVERSION" - - mkdir -p "$PGDATANEW" "$PGDATAOLD" - find "$PGDATABASE" -maxdepth 1 -mindepth 1 \ - -not -wholename "$PGDATAOLD" \ - -not -wholename "$PGDATANEW" \ - -exec mv {} "$PGDATAOLD/" \; - - chmod 700 "$PGDATAOLD" "$PGDATANEW" - chown postgres . - chown -R postgres "$PGDATAOLD" "$PGDATANEW" "$PGDATABASE" - if [ ! -s "$PGDATANEW/PG_VERSION" ]; then - PGDATA="$PGDATANEW" eval "gosu postgres initdb $POSTGRES_INITDB_ARGS" - fi - - gosu postgres pg_upgrade - rm $PGDATANEW/*.conf - mv $PGDATANEW/* "$PGDATABASE" - mv $PGDATAOLD/*.conf "$PGDATABASE" - rm -r "$PGDATANEW" - ./delete_old_cluster.sh - rm ./analyze_new_cluster.sh -fi - -if [ -f "docker-entrypoint.sh" ]; then - exec ./docker-entrypoint.sh "$@" -else - exec docker-entrypoint.sh "$@" -fi \ No newline at end of file diff --git a/README.md b/README.md index 1df33c696..e3216e622 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| postgres | 13.4 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | +| btcpayserver/postgres | 13.4 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 50650c585..47233c4d8 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -554,11 +554,11 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitRef = $"f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c"; break; case "postgres": - dockerInfo.DockerFilePath = $"9.6/Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = $"9.6/Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = $"9.6/Dockerfile"; - dockerInfo.GitLink = "https://github.com/docker-library/postgres"; - dockerInfo.GitRef = $"b7cb3c6eacea93be2259381033be3cc435649369"; + dockerInfo.DockerFilePath = $"Postgres/{NoRevision(image.Tag)}/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"Postgres/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Postgres/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"Postgres/{image.Tag}"; dockerInfo.SupportedByUs = true; break; case "traefik": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index d887e6a3a..2f59c907d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -1040,18 +1040,18 @@ cd - && cd .. # Build postgres -# https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile -DOCKERFILE="9.6/Dockerfile" -# https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="9.6/Dockerfile" -# https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="9.6/Dockerfile" -echo "Building postgres:13.4" -git clone https://github.com/docker-library/postgres postgres +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxamd64.Dockerfile +DOCKERFILE="Postgres/13.4/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Postgres/13.4/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Postgres/13.4/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/postgres:13.4" +git clone https://github.com/btcpayserver/dockerfile-deps postgres cd postgres -git checkout b7cb3c6eacea93be2259381033be3cc435649369 +git checkout Postgres/13.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "postgres:13.4" . +docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index 9e05783ed..113fe8de2 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,14 +3,11 @@ version: "3" services: postgres: restart: unless-stopped - image: postgres:13.4 - entrypoint: ./migrate-docker-entrypoint.sh - command: postgres + image: btcpayserver/postgres:13.4 environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: - "postgres_datadir:/var/lib/postgresql/data" - - "./postgres/migrate-docker-entrypoint.sh:/migrate-docker-entrypoint.sh:ro" volumes: postgres_datadir: From 730d42cf91c069fd3bc97bbb1dee64886a2997ae Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 22 Oct 2021 12:36:53 +0900 Subject: [PATCH 105/134] Update jm --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/opt-add-joinmarket.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e3216e622..a5c29c68c 100644 --- a/README.md +++ b/README.md @@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | -| btcpayserver/joinmarket | 0.9.3-devbtcpay | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | +| btcpayserver/joinmarket | 0.9.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2f59c907d..d6bef3afc 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -726,18 +726,18 @@ cd - && cd .. # Build joinmarket -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxamd64.Dockerfile DOCKERFILE="JoinMarket/0.9.3/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="JoinMarket/0.9.3/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3-devbtcpay/JoinMarket/0.9.3/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="JoinMarket/0.9.3/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/joinmarket:0.9.3-devbtcpay" +echo "Building btcpayserver/joinmarket:0.9.3" git clone https://github.com/btcpayserver/dockerfile-deps joinmarket cd joinmarket -git checkout JoinMarket/0.9.3-devbtcpay +git checkout JoinMarket/0.9.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.3-devbtcpay" . +docker build -f "$DOCKERFILE" -t "btcpayserver/joinmarket:0.9.3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml index 444f664db..948c1900a 100644 --- a/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml +++ b/docker-compose-generator/docker-fragments/opt-add-joinmarket.yml @@ -3,7 +3,7 @@ version: "3" services: joinmarket: container_name: joinmarket - image: btcpayserver/joinmarket:0.9.3-devbtcpay + image: btcpayserver/joinmarket:0.9.3 restart: unless-stopped environment: READY_FILE: /root/.nbxplorer/btc_fully_synched From a8ff18fb737890442834c8358f98b5a91a6db0b0 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 22 Oct 2021 13:29:34 +0900 Subject: [PATCH 106/134] update postgres --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/postgres.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a5c29c68c..5737de2f9 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| btcpayserver/postgres | 13.4 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | +| btcpayserver/postgres | 13.4-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index d6bef3afc..9730a3003 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -1040,18 +1040,18 @@ cd - && cd .. # Build postgres -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxamd64.Dockerfile DOCKERFILE="Postgres/13.4/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Postgres/13.4/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4/Postgres/13.4/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Postgres/13.4/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/postgres:13.4" +echo "Building btcpayserver/postgres:13.4-2" git clone https://github.com/btcpayserver/dockerfile-deps postgres cd postgres -git checkout Postgres/13.4 +git checkout Postgres/13.4-2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4" . +docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4-2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index 113fe8de2..57f181477 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,7 +3,7 @@ version: "3" services: postgres: restart: unless-stopped - image: btcpayserver/postgres:13.4 + image: btcpayserver/postgres:13.4-2 environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: From 6af4e80e78610396885f5c908bbb96991df69cee Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 22 Oct 2021 13:52:39 +0900 Subject: [PATCH 107/134] bump postgres --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/postgres.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5737de2f9..67be4fcd8 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| btcpayserver/postgres | 13.4-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | +| btcpayserver/postgres | 13.4-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 9730a3003..f290981d9 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -1040,18 +1040,18 @@ cd - && cd .. # Build postgres -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxamd64.Dockerfile DOCKERFILE="Postgres/13.4/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Postgres/13.4/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-2/Postgres/13.4/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Postgres/13.4/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/postgres:13.4-2" +echo "Building btcpayserver/postgres:13.4-3" git clone https://github.com/btcpayserver/dockerfile-deps postgres cd postgres -git checkout Postgres/13.4-2 +git checkout Postgres/13.4-3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4-2" . +docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4-3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index 57f181477..a0725c280 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,7 +3,7 @@ version: "3" services: postgres: restart: unless-stopped - image: btcpayserver/postgres:13.4-2 + image: btcpayserver/postgres:13.4-3 environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: From f936fb0f23585cf10e11d659af9a3ad9b6aba331 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 22 Oct 2021 15:02:02 +0900 Subject: [PATCH 108/134] bump postgres --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/postgres.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 67be4fcd8..a741716c0 100644 --- a/README.md +++ b/README.md @@ -353,7 +353,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.5.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.5.9/Tor/0.4.5.9/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| btcpayserver/postgres | 13.4-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | +| btcpayserver/postgres | 13.4-4 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f290981d9..ee016e538 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -1040,18 +1040,18 @@ cd - && cd .. # Build postgres -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxamd64.Dockerfile DOCKERFILE="Postgres/13.4/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Postgres/13.4/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-3/Postgres/13.4/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.4-4/Postgres/13.4/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Postgres/13.4/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/postgres:13.4-3" +echo "Building btcpayserver/postgres:13.4-4" git clone https://github.com/btcpayserver/dockerfile-deps postgres cd postgres -git checkout Postgres/13.4-3 +git checkout Postgres/13.4-4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4-3" . +docker build -f "$DOCKERFILE" -t "btcpayserver/postgres:13.4-4" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index a0725c280..83f40cc25 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,7 +3,7 @@ version: "3" services: postgres: restart: unless-stopped - image: btcpayserver/postgres:13.4-3 + image: btcpayserver/postgres:13.4-4 environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: From 92b93ca74d0de34265dbf1c267f12bf0487a9a57 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 23 Oct 2021 21:46:24 +0900 Subject: [PATCH 109/134] bump nbxplorer --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a741716c0..4496fd981 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.2.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.12 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ee016e538..b5356c49f 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.12/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.12" +echo "Building nicolasdorier/nbxplorer:2.2.15" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.12 +git checkout v2.2.15 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.12" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.15" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index a0714fbfe..d6a79eba2 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.12 + image: nicolasdorier/nbxplorer:2.2.15 expose: - "32838" environment: From 1b7c038aff0fe396a447e5a4c570e07e44a3164b Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 29 Oct 2021 23:48:50 +0900 Subject: [PATCH 110/134] bump --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4496fd981..beb2bbf5a 100644 --- a/README.md +++ b/README.md @@ -341,7 +341,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.2.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index b5356c49f..3d32d74be 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.2.4/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.2.4$?" +echo "Building btcpayserver/btcpayserver:1.3.0$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.2.4 +git checkout v1.3.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.2.4$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.0$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 41033fb19..c1d69d47d 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.2.4$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.0$?} expose: - "49392" environment: From 0682ba1311ec52da9e31633f52e61b2a2876c75f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 30 Oct 2021 00:08:38 +0900 Subject: [PATCH 111/134] Make sure only one lightning implementation is selected --- .../docker-fragments/bitcoin-clightning.yml | 2 ++ docker-compose-generator/docker-fragments/bitcoin-eclair.yml | 2 ++ docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index ba49f6104..2026a1ad7 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -113,3 +113,5 @@ volumes: clightning_bitcoin_charge: clightning_bitcoin_rtl_datadir: clightning_bitcoin_rest_datadir: +exclusive: + - lightning \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 966d13a91..356be092b 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -78,3 +78,5 @@ incompatible: required: - "opt-add-zmq" - "opt-txindex" +exclusive: + - lightning \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 83ac19eea..5cf21dd17 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -109,3 +109,5 @@ volumes: required: - "opt-add-zmq" +exclusive: + - lightning \ No newline at end of file From 29a547a75919d93bd59391bd1af564c7df366af1 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 30 Oct 2021 14:07:25 +0900 Subject: [PATCH 112/134] bump btcpay --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index beb2bbf5a..58e27dde7 100644 --- a/README.md +++ b/README.md @@ -341,7 +341,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.0$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 3d32d74be..7d5c5d187 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.0/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.0$?" +echo "Building btcpayserver/btcpayserver:1.3.1$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.0 +git checkout v1.3.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.0$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.1$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index c1d69d47d..d315eaebe 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.3.0$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.1$?} expose: - "49392" environment: From 343b9c667e550a2e541a2fe0e9f9eff631f6e0fb Mon Sep 17 00:00:00 2001 From: Anthony Potdevin <31413433+apotdevin@users.noreply.github.com> Date: Sun, 31 Oct 2021 15:18:07 +0100 Subject: [PATCH 113/134] Bump ThunderHub version (#547) --- .../docker-fragments/opt-add-thunderhub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml index 65324a2ef..ed18be57a 100644 --- a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml +++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml @@ -6,7 +6,7 @@ services: volumes: - "lnd_bitcoin_thub_datadir:/etc/lnd_bitcoin_thub_datadir" bitcoin_thub: - image: apotdevin/thunderhub:base-v0.12.17@sha256:a5f85ee15c5d8f31630c28c702a035b2b2a50b5ac2145eb1f6ce0e4c1c69bdc9 + image: apotdevin/thunderhub:base-v0.12.31@sha256:c9b60170a7cc2d4922d31e4b9d9d3c5948121e3fc6d9b88a264312d138670021 restart: unless-stopped stop_signal: SIGKILL environment: From 688e1ec46f6e121d6189c930153a7f26fb53d005 Mon Sep 17 00:00:00 2001 From: d11n Date: Mon, 1 Nov 2021 09:07:16 +0100 Subject: [PATCH 114/134] Upgrade Tallycoin Connect (#541) * Upgrade Tallycoin Connect Now it also supports arm32v7 and arm64v8 architectures. * Correct Dockerfile repo * Add images to Docker file builder helper * Fix GitHub link --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 4 +++- contrib/build-all-images.sh | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 58e27dde7..0aee0d34d 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-bluewallet-lndhub](docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml) for [Bluewallet LNDHub](https://github.com/BlueWallet/LndHub) - Use non-custodial LND Lightning directly from your Bluewallet, and freely let others open accounts on your node. Fragment maintained by [maltokyo](https://github.com/maltokyo). * [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md)) * [opt-add-sphinxrelay](docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml) for [Sphinx Relay](https://github.com/stakwork/sphinx-relay). Maintained by [dennisreimann](https://github.com/dennisreimann). -* [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/djbooth007/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann). +* [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/dennisreimann/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann). * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin). * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect. * [opt-add-chatwoot](docker-compose-generator/docker-fragments/opt-add-chatwoot.yml) for open source chat support system. ([See the documentation](docs/chatwoot.md)) @@ -382,7 +382,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 47233c4d8..1b155566f 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Collections.Generic; using System.IO; @@ -277,6 +277,8 @@ private DockerInfo GetDockerInfo(Image image) break; case "tallycoin_connect": dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"Dockerfile.arm32v7"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile.arm64v8"; dockerInfo.GitLink = "https://github.com/dennisreimann/tallycoin_connect"; dockerInfo.GitRef = $"{image.Tag}"; dockerInfo.SupportedByUs = false; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 7d5c5d187..c5b4b0f82 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -719,7 +719,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -1089,5 +1089,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - From 1539961223cad1c580f7024b210ff421fd1cd9ff Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 1 Nov 2021 20:00:56 +0900 Subject: [PATCH 115/134] Automatically update libseccomp2 on rapsberry pi 4 --- btcpay-setup.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 24db2bed0..53eaeb05f 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -423,6 +423,17 @@ if ! [[ -x "$(command -v docker)" ]] || ! [[ -x "$(command -v docker-compose)" ] fi fi + if [[ "$(uname -m)" == "armv7l" ]] && [[ "$(uname -n)" == "raspberrypi" ]]; then + if [[ "$(apt list libseccomp2 2>/dev/null)" == *"2.3.3"* ]]; then + echo "Outdated version of libseccomp2, updating... (see: https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/)" + # https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 + echo 'deb http://httpredir.debian.org/debian buster-backports main contrib non-free' | sudo tee -a /etc/apt/sources.list.d/debian-backports.list + apt update + apt install libseccomp2 -t buster-backports + fi + fi + if ! [[ -x "$(command -v docker-compose)" ]]; then if ! [[ "$OSTYPE" == "darwin"* ]] && $HAS_DOCKER; then echo "Trying to install docker-compose by using the btcpayserver/docker-compose ($(uname -m))" From ae64ff21fab9687d1d27c1151298117300916249 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 5 Nov 2021 00:37:34 +0900 Subject: [PATCH 116/134] Bump BTCPay --- README.md | 6 ++-- contrib/build-all-images.sh | 32 +++++++++++-------- .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 0aee0d34d..d931d32af 100644 --- a/README.md +++ b/README.md @@ -341,7 +341,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.1$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | @@ -382,9 +382,9 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | -| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | ️[✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| apotdevin/thunderhub | base-v0.12.17 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | +| apotdevin/thunderhub | base-v0.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c5b4b0f82..ba8e58f7d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.1/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.1$?" +echo "Building btcpayserver/btcpayserver:1.3.2$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.1 +git checkout v1.3.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.1$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.2$?" . cd - && cd .. @@ -719,7 +719,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -814,6 +814,10 @@ cd - && cd .. # Build tallycoin_connect # https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" +# https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" echo "Building dennisreimann/tallycoin_connect:v1.7.0" git clone https://github.com/dennisreimann/tallycoin_connect tallycoin_connect cd tallycoin_connect @@ -840,18 +844,18 @@ cd - && cd .. # Build thunderhub -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm32v7.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.17/arm64v8.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building apotdevin/thunderhub:base-v0.12.17" +echo "Building apotdevin/thunderhub:base-v0.12.31" git clone https://github.com/apotdevin/thunderhub thunderhub cd thunderhub -git checkout v0.12.17 +git checkout v0.12.31 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.12.17" . +docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.12.31" . cd - && cd .. @@ -1089,3 +1093,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index d315eaebe..53ad03688 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.3.1$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.2$?} expose: - "49392" environment: From d102e2f04281d67082e39a5e21112e4de382d29a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 5 Nov 2021 12:37:26 +0900 Subject: [PATCH 117/134] bump BTCPay --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d931d32af..e585d47ef 100644 --- a/README.md +++ b/README.md @@ -341,7 +341,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.2$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ba8e58f7d..0dc69ab00 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.2/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.2$?" +echo "Building btcpayserver/btcpayserver:1.3.3$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.2 +git checkout v1.3.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.2$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.3$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 53ad03688..e54900eab 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.3.2$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.3$?} expose: - "49392" environment: From afafca2f261af38cdc182aa721773e16f001c43c Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 5 Nov 2021 11:13:22 +0100 Subject: [PATCH 118/134] Update opt-add-btctransmuter.yml --- .../docker-fragments/opt-add-btctransmuter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml index 34ed3d192..00f01f5de 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml @@ -3,7 +3,7 @@ version: "3" services: btctransmuter: restart: unless-stopped - image: btcpayserver/btctransmuter:0.0.57 + image: btcpayserver/btctransmuter:0.0.59 container_name: btctransmuter environment: TRANSMUTER_Database: User ID=postgres;Host=postgres;Port=5432;Database=btctransmuter${NBITCOIN_NETWORK:-regtest} From 4eff3f4c1c6a2046cdd5d0ed4083533e07e44920 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 9 Nov 2021 11:25:48 +0900 Subject: [PATCH 119/134] Update libseccomp2 on any arm32 buster hosts --- btcpay-setup.sh | 11 +---------- btcpay-update.sh | 1 + helpers.sh | 13 +++++++++++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 53eaeb05f..2f45574cc 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -423,16 +423,7 @@ if ! [[ -x "$(command -v docker)" ]] || ! [[ -x "$(command -v docker-compose)" ] fi fi - if [[ "$(uname -m)" == "armv7l" ]] && [[ "$(uname -n)" == "raspberrypi" ]]; then - if [[ "$(apt list libseccomp2 2>/dev/null)" == *"2.3.3"* ]]; then - echo "Outdated version of libseccomp2, updating... (see: https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/)" - # https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 - echo 'deb http://httpredir.debian.org/debian buster-backports main contrib non-free' | sudo tee -a /etc/apt/sources.list.d/debian-backports.list - apt update - apt install libseccomp2 -t buster-backports - fi - fi + docker_update if ! [[ -x "$(command -v docker-compose)" ]]; then if ! [[ "$OSTYPE" == "darwin"* ]] && $HAS_DOCKER; then diff --git a/btcpay-update.sh b/btcpay-update.sh index b47c91524..5de620582 100755 --- a/btcpay-update.sh +++ b/btcpay-update.sh @@ -68,6 +68,7 @@ if [[ "$ACME_CA_URI" == "https://acme-staging.api.letsencrypt.org/directory" ]]; fi . helpers.sh +docker_update install_tooling btcpay_update_docker_env btcpay_up diff --git a/helpers.sh b/helpers.sh index c62aed126..79e174016 100755 --- a/helpers.sh +++ b/helpers.sh @@ -113,6 +113,19 @@ FIREFLY_HOST=$FIREFLY_HOST" > $BTCPAY_ENV_FILE env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true } +docker_update() { + if [[ "$(uname -m)" == "armv7l" ]] && cat "/etc/os-release" 2>/dev/null | grep -q "VERSION_CODENAME=buster" 2>/dev/null; then + if [[ "$(apt list libseccomp2 2>/dev/null)" == *" 2.3"* ]]; then + echo "Outdated version of libseccomp2, updating... (see: https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/)" + # https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 + echo 'deb http://httpredir.debian.org/debian buster-backports main contrib non-free' | sudo tee -a /etc/apt/sources.list.d/debian-backports.list + apt update + apt install libseccomp2 -t buster-backports + fi + fi +} + btcpay_up() { pushd . > /dev/null cd "$(dirname "$BTCPAY_ENV_FILE")" From 903d0617ef198fd2511c7ddfd0b175e2eed35335 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 10 Nov 2021 00:23:19 +0900 Subject: [PATCH 120/134] bump btcpay --- README.md | 4 ++-- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index e585d47ef..d8af7cf5a 100644 --- a/README.md +++ b/README.md @@ -341,12 +341,12 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.3$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | -| btcpayserver/btctransmuter | 0.0.57 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | +| btcpayserver/btctransmuter | 0.0.59 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | | btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | | btcpayserver/joinmarket | 0.9.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 0dc69ab00..28fc23950 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.3/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.3$?" +echo "Building btcpayserver/btcpayserver:1.3.4$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.3 +git checkout v1.3.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.3$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.4$?" . cd - && cd .. @@ -598,18 +598,18 @@ cd - && cd .. # Build btctransmuter -# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile DOCKERFILE="Dockerfiles/amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfiles/arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.57/Dockerfiles/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfiles/arm64v8.Dockerfile" -echo "Building btcpayserver/btctransmuter:0.0.57" +echo "Building btcpayserver/btctransmuter:0.0.59" git clone https://github.com/btcpayserver/btctransmuter btctransmuter cd btctransmuter -git checkout v0.0.57 +git checkout v0.0.59 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btctransmuter:0.0.57" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btctransmuter:0.0.59" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index e54900eab..2ba63fa7f 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.3.3$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.4$?} expose: - "49392" environment: From b41a5e46646adde6571869b4b3a0c10f8c8987ab Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 11 Nov 2021 00:06:16 +0900 Subject: [PATCH 121/134] update NBXplorer --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/nbxplorer.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d8af7cf5a..ea6a59483 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.3.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.2.15 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.2.18 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 28fc23950..c41d6eb0f 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -484,18 +484,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.15/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.2.15" +echo "Building nicolasdorier/nbxplorer:2.2.18" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.2.15 +git checkout v2.2.18 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.15" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.2.18" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index d6a79eba2..a893ca046 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.2.15 + image: nicolasdorier/nbxplorer:2.2.18 expose: - "32838" environment: From 9bc6fa7bddca27820f5fbd022f109462e05d8d81 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 15 Nov 2021 22:55:59 +0900 Subject: [PATCH 122/134] bump btcpay --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ea6a59483..737c9c301 100644 --- a/README.md +++ b/README.md @@ -341,7 +341,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.5$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.18 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c41d6eb0f..3146466cd 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.4/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.4$?" +echo "Building btcpayserver/btcpayserver:1.3.5$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.4 +git checkout v1.3.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.4$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.5$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 2ba63fa7f..edc58426e 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.3.4$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.5$?} expose: - "49392" environment: From ee2c3f2fcd358bbd8118206098741b4a47aea37f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 20 Nov 2021 22:46:35 +0900 Subject: [PATCH 123/134] bump LND and BTCPay --- README.md | 4 ++-- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/bitcoin-lnd.yml | 2 +- .../docker-fragments/btcpayserver.yml | 2 +- .../docker-fragments/opt-add-tor.yml | 1 + 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 737c9c301..d920e7d9e 100644 --- a/README.md +++ b/README.md @@ -339,9 +339,9 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.5.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.13.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.14.0-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.5$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.6$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.18 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 3146466cd..97f3b3603 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -170,18 +170,18 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.13.3-beta/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.13.3-beta" +echo "Building btcpayserver/lnd:v0.14.0-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.13.3-beta +git checkout basedon-v0.14.0-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.13.3-beta" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.14.0-beta" . cd - && cd .. @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.5/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.5$?" +echo "Building btcpayserver/btcpayserver:1.3.6$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.5 +git checkout v1.3.6 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.5$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.6$?" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 5cf21dd17..0bbdc360d 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.13.3-beta + image: btcpayserver/lnd:v0.14.0-beta container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index edc58426e..a95daa2cb 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.3.5$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.6$?} expose: - "49392" environment: diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index 91a7a385d..2d9853bbb 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -126,6 +126,7 @@ services: LND_HIDDENSERVICE_HOSTNAME_FILE: /var/lib/tor/hidden_services/lnd/hostname LND_EXTRA_ARGS: | tor.active=1 + tor.skip-proxy-for-clearnet-targets=1 tor.socks=tor:9050 links: - tor From 0e0f8e7dce1bd146e6d12a964e650eba5cc0ecb7 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 25 Nov 2021 14:20:55 +0900 Subject: [PATCH 124/134] bump lnd --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin-lnd.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d920e7d9e..77ffd891e 100644 --- a/README.md +++ b/README.md @@ -339,7 +339,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.5.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.14.0-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/lnd | v0.14.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | | btcpayserver/btcpayserver | 1.3.6$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.18 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 97f3b3603..cee11ee4a 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -170,18 +170,18 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.0-beta/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.14.0-beta" +echo "Building btcpayserver/lnd:v0.14.1-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.14.0-beta +git checkout basedon-v0.14.1-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.14.0-beta" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.14.1-beta" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 0bbdc360d..81e221f6b 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:v0.14.0-beta + image: btcpayserver/lnd:v0.14.1-beta container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: From f0c424f177524ffd75c5b86dadfb9cf5fd268785 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 25 Nov 2021 23:01:37 +0900 Subject: [PATCH 125/134] bump clightning --- README.md | 2 +- contrib/build-all-images.sh | 12 ++++++------ .../docker-fragments/bitcoin-clightning.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 77ffd891e..18d3f0dfb 100644 --- a/README.md +++ b/README.md @@ -334,7 +334,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | | btcpayserver/bitcoin | 22.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/22.0-1/Bitcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/lightning | v0.10.1-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| btcpayserver/lightning | v0.10.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.23-1-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.23/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | saubyk/c-lightning-rest | 0.5.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.5.2/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index cee11ee4a..ef815ceeb 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.1-2/contrib/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.10.1-2" +echo "Building btcpayserver/lightning:v0.10.2" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.10.1-2 +git checkout basedon-v0.10.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.1-2" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 2026a1ad7..298d15564 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_bitcoin: - image: btcpayserver/lightning:v0.10.1-2 + image: btcpayserver/lightning:v0.10.2 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: From 8b07b2b47d743401e65e09d05509ca010da6a34a Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 29 Nov 2021 17:51:33 +0900 Subject: [PATCH 126/134] bump woocommerce --- README.md | 2 +- contrib/build-all-images.sh | 8 ++++---- .../docker-fragments/opt-add-woocommerce.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 18d3f0dfb..bc9e21245 100644 --- a/README.md +++ b/README.md @@ -385,7 +385,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | -| btcpayserver/docker-woocommerce | 3.0.14 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | +| btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | | memcached | 1.5.22-alpine | [✔️](https://raw.githubusercontent.com/docker-library/memcached/master/alpine/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/memcached) - [DockerHub](https://hub.docker.com/_/memcached) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index ef815ceeb..c8212a531 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -924,14 +924,14 @@ cd - && cd .. # Build docker-woocommerce -# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.14/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/docker-woocommerce:3.0.14" +echo "Building btcpayserver/docker-woocommerce:3.0.15" git clone https://github.com/btcpayserver/docker-woocommerce docker-woocommerce cd docker-woocommerce -git checkout v3.0.14 +git checkout v3.0.15 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.14" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.15" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml index 4aaac6d76..bf5e7c3c8 100644 --- a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml +++ b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml @@ -2,7 +2,7 @@ version: '3' services: woocommerce: - image: btcpayserver/docker-woocommerce:3.0.14 + image: btcpayserver/docker-woocommerce:3.0.15 environment: WOOCOMMERCE_HOST: ${WOOCOMMERCE_HOST} WORDPRESS_DB_HOST: mariadb From 3d6d2a81db81a6042d6ac625509e0683372bb091 Mon Sep 17 00:00:00 2001 From: d11n Date: Wed, 1 Dec 2021 12:38:02 +0100 Subject: [PATCH 127/134] Add Lightning Terminal fragment (#512) * Add Lightning Terminal fragment * Remove mappings and variables * Version update * Update contrib/build-all-images.sh Co-authored-by: Oliver Gugger * Update docker version * Add Lightning Terminal to fragments list * Upgrade LiT to v0.6.0 Co-authored-by: Oliver Gugger --- Production/nginx.tmpl | 33 +++++++++++++++---- README.md | 2 ++ contrib/DockerFileBuildHelper/Program.cs | 9 ++++- contrib/build-all-images.sh | 16 +++++++-- .../opt-add-lightning-terminal.yml | 33 +++++++++++++++++++ 5 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index af5f2391a..7d6fb7a47 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -1,4 +1,4 @@ -{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }} +{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }} {{ define "upstream" }} {{ if .Address }} {{/* If we got the containers from swarm and this container's port is published to host, use host IP:PORT */}} @@ -18,7 +18,7 @@ server 127.0.0.1 down; {{ end }} {{ end }} - + {{ end }} {{ define "redirects" }} @@ -69,7 +69,7 @@ location /lightning-charge/btc/ { proxy_pass http://clightning_bitcoin_charge:9112/; } - {{ end }} + {{ end }} {{ if (eq $serviceName "clightning_bitcoin_rest") }} location /clightning-rest/btc/ { rewrite ^/clightning-rest/btc/(.*) /$1 break; @@ -86,7 +86,7 @@ proxy_pass http://clightning_groestlcoin_charge:9112/; } {{ end }} - + {{ if (eq $serviceName "btctransmuter") }} location /btctransmuter/ { proxy_set_header Connection ""; @@ -110,7 +110,28 @@ } {{ end }} - + {{ if (eq $serviceName "lnd_lit") }} + location /lit { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://lnd_lit:8080/; + } + + location ~* ^/lnrpc.Lightning/ { + proxy_pass http://lnd_lit:8080; + } + + location ~* ^/looprpc.SwapClient/ { + proxy_pass http://lnd_lit:8080; + } + + location ~* ^/poolrpc.Trader/ { + proxy_pass http://lnd_lit:8080; + } + {{ end }} + {{ if (eq $serviceName "sphinxrelay") }} location /sphinxrelay/ { proxy_set_header Host $host; @@ -597,4 +618,4 @@ server { {{ end }} {{ if $.Env.ADDITIONAL_NGINX_CONFIG }} {{ $.Env.ADDITIONAL_NGINX_CONFIG}} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/README.md b/README.md index bc9e21245..18e9043aa 100644 --- a/README.md +++ b/README.md @@ -176,6 +176,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-pihole](docker-compose-generator/docker-fragments/opt-add-pihole.yml) ([See the documentation](docs/pihole.md)) * [opt-add-bluewallet-lndhub](docker-compose-generator/docker-fragments/opt-add-bluewallet-lndhub.yml) for [Bluewallet LNDHub](https://github.com/BlueWallet/LndHub) - Use non-custodial LND Lightning directly from your Bluewallet, and freely let others open accounts on your node. Fragment maintained by [maltokyo](https://github.com/maltokyo). * [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md)) +* [opt-add-lightning-terminal](docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml) for [Lightning Terminal/LiT](https://github.com/lightninglabs/lightning-terminal). Maintained by [dennisreimann](https://github.com/dennisreimann). * [opt-add-sphinxrelay](docker-compose-generator/docker-fragments/opt-add-sphinxrelay.yml) for [Sphinx Relay](https://github.com/stakwork/sphinx-relay). Maintained by [dennisreimann](https://github.com/dennisreimann). * [opt-add-tallycoin-connect](docker-compose-generator/docker-fragments/opt-add-tallycoin-connect.yml) for [Tallycoin Connect](https://github.com/dennisreimann/tallycoin_connect). Maintained by [dennisreimann](https://github.com/dennisreimann). * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin). @@ -383,6 +384,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| lightninglabs/lightning-terminal | v0.6.0-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 1b155566f..2f3d29261 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -283,6 +283,13 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.GitRef = $"{image.Tag}"; dockerInfo.SupportedByUs = false; break; + case "lnd_lit": + dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; + dockerInfo.GitLink = "https://github.com/lightninglabs/lightning-terminal"; + dockerInfo.GitRef = $"{image.Tag}"; + dockerInfo.SupportedByUs = false; + break; case "docker-bitcoingold": dockerInfo.DockerFilePath = $"bitcoingold/{image.Tag}/Dockerfile"; dockerInfo.GitLink = "https://github.com/Vutov/docker-bitcoin"; @@ -658,7 +665,7 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; dockerInfo.GitLink = "https://dev.azure.com/Firefly-III/_git/MainImage"; dockerInfo.RawLink = "https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true"; - + dockerInfo.GitRef = null; break; default: diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index c8212a531..e249be519 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -719,7 +719,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -827,6 +827,18 @@ docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . cd - && cd .. +# Build lightning-terminal +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile +DOCKERFILE="Dockerfile" +echo "Building lightninglabs/lightning-terminal/v0.6.0-alpha-path-prefix" +git clone https://github.com/lightninglabs/lightning-terminal.git lightning-terminal +cd lightning-terminal +git checkout v0.6.0-alpha +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" . +cd - && cd .. + + # Build python-teos # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile DOCKERFILE="docker/Dockerfile" @@ -1093,5 +1105,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - - diff --git a/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml new file mode 100644 index 000000000..76f38ef67 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml @@ -0,0 +1,33 @@ +version: "3" +services: + btcpayserver: + environment: + BTCPAY_EXTERNALSERVICES: "Lightning Terminal:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lit/;" + lnd_lit: + image: "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" + restart: unless-stopped + expose: + - "8080" + volumes: + - "lnd_lit_datadir:/data/lit" + - "lnd_bitcoin_datadir:/data/lnd:ro" + links: + - bitcoind + - lnd_bitcoin + command: + - "--insecure-httplisten=0.0.0.0:8080" + - "--network=${NBITCOIN_NETWORK}" + - "--uipassword=${LIT_PASSWD}" + - "--lnd-mode=remote" + - "--remote.lnd.rpcserver=lnd_bitcoin:10009" + - "--remote.lnd.macaroonpath=/data/lnd/admin.macaroon" + - "--remote.lnd.tlscertpath=/data/lnd/tls.cert" + - "--faraday.connect_bitcoin" + - "--faraday.bitcoin.host=bitcoind:43782" + - "--faraday.bitcoin.user=lnd" + - "--faraday.bitcoin.password=afixedpasswordbecauselndsuckswithcookiefile" +volumes: + lnd_lit_datadir: +required: + - "bitcoin-lnd" + - "opt-lnd-grpc" From 9760747959275bd5865f609c5cacbea24892516f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 9 Dec 2021 18:20:56 +0900 Subject: [PATCH 128/134] Update Litecoin --- README.md | 4 +- contrib/DockerFileBuildHelper/Program.cs | 8 +++- contrib/build-all-images.sh | 42 ++++++++++--------- .../docker-fragments/litecoin.yml | 2 +- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 18e9043aa..983ab0b90 100644 --- a/README.md +++ b/README.md @@ -370,7 +370,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | groestlcoin/eclair | v0.6.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) | | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) | | btcpayserver/elements | 0.18.1.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | -| btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | +| btcpayserver/litecoin | 0.18.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1/Litecoin/0.18.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1/Litecoin/0.18.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | | btcpayserver/monero | 0.17.2.3 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | redis | 6.2.2-buster | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | @@ -382,9 +382,9 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | fireflyiii/core | latest | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [Github](https://dev.azure.com/Firefly-III/_git/MainImage) - [DockerHub](https://hub.docker.com/r/fireflyiii/core) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | +| lightninglabs/lightning-terminal | v0.6.0-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | -| lightninglabs/lightning-terminal | v0.6.0-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 2f3d29261..4f51cfe4b 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Collections.Generic; using System.IO; @@ -665,9 +665,13 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.DockerFilePathARM64v8 = $"Dockerfile"; dockerInfo.GitLink = "https://dev.azure.com/Firefly-III/_git/MainImage"; dockerInfo.RawLink = "https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true"; - dockerInfo.GitRef = null; break; + case "lightninglabs/lightning-terminal": + dockerInfo.GitLink = "https://github.com/lightninglabs/lightning-terminal"; + dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.GitRef = image.Tag.Replace("-path-prefix", ""); + break; default: if (firstTry) { diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index e249be519..450f9c041 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -434,16 +434,16 @@ cd - && cd .. # Build litecoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile -DOCKERFILE="Litecoin/0.17.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Litecoin/0.17.1/linuxarm32v7.Dockerfile" -echo "Building btcpayserver/litecoin:0.17.1-1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1/Litecoin/0.18.1/linuxamd64.Dockerfile +DOCKERFILE="Litecoin/0.18.1/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1/Litecoin/0.18.1/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Litecoin/0.18.1/linuxarm32v7.Dockerfile" +echo "Building btcpayserver/litecoin:0.18.1" git clone https://github.com/btcpayserver/dockerfile-deps litecoin cd litecoin -git checkout Litecoin/0.17.1-1 +git checkout Litecoin/0.18.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/litecoin:0.17.1-1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/litecoin:0.18.1" . cd - && cd .. @@ -719,7 +719,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -765,6 +765,18 @@ docker build -f "$DOCKERFILE" -t "jvandrew/isso:atron.22" . cd - && cd .. +# Build lightning-terminal +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile +DOCKERFILE="Dockerfile" +echo "Building lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" +git clone https://github.com/lightninglabs/lightning-terminal lightning-terminal +cd lightning-terminal +git checkout v0.6.0-alpha +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" . +cd - && cd .. + + # Build ndlc-cli # https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" @@ -827,18 +839,6 @@ docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . cd - && cd .. -# Build lightning-terminal -# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile -DOCKERFILE="Dockerfile" -echo "Building lightninglabs/lightning-terminal/v0.6.0-alpha-path-prefix" -git clone https://github.com/lightninglabs/lightning-terminal.git lightning-terminal -cd lightning-terminal -git checkout v0.6.0-alpha -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" . -cd - && cd .. - - # Build python-teos # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile DOCKERFILE="docker/Dockerfile" @@ -1105,3 +1105,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml index f58ced3de..1e2996641 100644 --- a/docker-compose-generator/docker-fragments/litecoin.yml +++ b/docker-compose-generator/docker-fragments/litecoin.yml @@ -4,7 +4,7 @@ services: litecoind: restart: unless-stopped container_name: btcpayserver_litecoind - image: btcpayserver/litecoin:0.17.1-1 + image: btcpayserver/litecoin:0.18.1 environment: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_EXTRA_ARGS: | From 32074e05c27aa564e4cf4bcd7eb8e6b08273df6f Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 9 Dec 2021 18:27:14 +0900 Subject: [PATCH 129/134] fix litecoin --- docker-compose-generator/docker-fragments/litecoin.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml index 1e2996641..a428e3cbf 100644 --- a/docker-compose-generator/docker-fragments/litecoin.yml +++ b/docker-compose-generator/docker-fragments/litecoin.yml @@ -9,6 +9,8 @@ services: BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} BITCOIN_EXTRA_ARGS: | rpcport=43782 + rpcbind=0.0.0.0:43782 + rpcallowip=0.0.0.0/0 port=39388 whitelist=0.0.0.0/0 expose: From 6920b800bc77785e6114130b12ae30dc030ddb23 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 13 Dec 2021 11:18:38 +0900 Subject: [PATCH 130/134] Update EPS --- README.md | 2 +- contrib/build-all-images.sh | 18 +++++++++--------- .../docker-fragments/opt-add-electrum-ps.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 983ab0b90..a6b73e5f1 100644 --- a/README.md +++ b/README.md @@ -349,7 +349,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | btcpayserver/btctransmuter | 0.0.59 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | -| btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | +| btcpayserver/eps | 0.2.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | | btcpayserver/joinmarket | 0.9.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.3/JoinMarket/0.9.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/joinmarket) | | nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.7 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.7/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 450f9c041..8bfcc3089 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -682,18 +682,18 @@ cd - && cd .. # Build eps -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile -DOCKERFILE="EPS/0.2.1.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="EPS/0.2.1.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.1.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/eps:0.2.1.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxamd64.Dockerfile +DOCKERFILE="EPS/0.2.2/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="EPS/0.2.2/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.2/EPS/0.2.2/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.2/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/eps:0.2.2" git clone https://github.com/btcpayserver/dockerfile-deps eps cd eps -git checkout EPS/0.2.1.1 +git checkout EPS/0.2.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.1.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml b/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml index 5758efd56..f701ab648 100644 --- a/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml +++ b/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml @@ -6,7 +6,7 @@ services: BITCOIN_EXTRA_ARGS: | rpcauth=eps:3d1cff5ee81ddeb3ba94483150310e74$$4626aeb95b2a2b066eac8833c1ad936f65cf7492aa836ec8f173ff65ac428a0e electrum_ps: - image: btcpayserver/eps:0.2.1.1 + image: btcpayserver/eps:0.2.2 restart: unless-stopped ports: - "50002:50002" From 595a71100e03a99cc32b5e91dbf45785549f4570 Mon Sep 17 00:00:00 2001 From: Jin Eguchi Date: Mon, 13 Dec 2021 20:04:26 +0900 Subject: [PATCH 131/134] Bump monacoin to 0.20.2 (#563) --- README.md | 2 +- docker-compose-generator/docker-fragments/monacoin.yml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a6b73e5f1..5c10d2ec8 100644 --- a/README.md +++ b/README.md @@ -371,7 +371,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) | | btcpayserver/elements | 0.18.1.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.12/Elements/0.18.1.12/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.18.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1/Litecoin/0.18.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1/Litecoin/0.18.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | -| wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | +| wakiyamap/docker-monacoin | 0.20.2 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.20.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | | btcpayserver/monero | 0.17.2.3 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | redis | 6.2.2-buster | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | bluewalletorganization/lndhub | v1.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | diff --git a/docker-compose-generator/docker-fragments/monacoin.yml b/docker-compose-generator/docker-fragments/monacoin.yml index 5331c9920..2e57428a3 100644 --- a/docker-compose-generator/docker-fragments/monacoin.yml +++ b/docker-compose-generator/docker-fragments/monacoin.yml @@ -4,11 +4,13 @@ services: monacoind: restart: unless-stopped container_name: btcpayserver_monacoind - image: wakiyamap/docker-monacoin:0.17.1 + image: wakiyamap/docker-monacoin:0.20.2 environment: BITCOIN_EXTRA_ARGS: | - rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 + rpcport=43782 + rpcbind=0.0.0.0:43782 + rpcallowip=0.0.0.0/0 port=39388 whitelist=0.0.0.0/0 expose: From c470bb278e52b8b57967bf79fbe5cd81d0f05818 Mon Sep 17 00:00:00 2001 From: d11n Date: Mon, 13 Dec 2021 12:06:04 +0100 Subject: [PATCH 132/134] Update Lightning Terminal (#562) Co-authored-by: Andrew Camilleri --- README.md | 1 + contrib/build-all-images.sh | 12 ++++++++++++ .../docker-fragments/opt-add-lightning-terminal.yml | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c10d2ec8..ff10225a8 100644 --- a/README.md +++ b/README.md @@ -385,6 +385,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | lightninglabs/lightning-terminal | v0.6.0-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | +| lightninglabs/lightning-terminal | v0.6.1-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 8bfcc3089..f8001d970 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -839,6 +839,18 @@ docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . cd - && cd .. +# Build lightning-terminal +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile +DOCKERFILE="Dockerfile" +echo "Building lightninglabs/lightning-terminal/v0.6.1-alpha-path-prefix" +git clone https://github.com/lightninglabs/lightning-terminal.git lightning-terminal +cd lightning-terminal +git checkout v0.6.1-alpha +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.1-alpha-path-prefix" . +cd - && cd .. + + # Build python-teos # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile DOCKERFILE="docker/Dockerfile" diff --git a/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml index 76f38ef67..a592de19d 100644 --- a/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml +++ b/docker-compose-generator/docker-fragments/opt-add-lightning-terminal.yml @@ -4,7 +4,7 @@ services: environment: BTCPAY_EXTERNALSERVICES: "Lightning Terminal:${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lit/;" lnd_lit: - image: "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" + image: "lightninglabs/lightning-terminal:v0.6.1-alpha-path-prefix" restart: unless-stopped expose: - "8080" From bfa73fcf1810483417f2898daffc52cec1991858 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 14 Dec 2021 12:20:00 +0900 Subject: [PATCH 133/134] bump btcpay --- README.md | 5 +-- contrib/build-all-images.sh | 40 +++++++------------ .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index ff10225a8..2698c9fa6 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | shahanafarooqui/rtl | 0.11.2 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile.arm64v8) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.14.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.14.1-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/bitcointaprootcc/0.21.0-bip8-lottrue/bitcointaprootcc/0.21.0-bip8-lottrue/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcointaprootcc/0.21.0-bip8-lottrue) | -| btcpayserver/btcpayserver | 1.3.6$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 1.3.7$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | nicolasdorier/nbxplorer | 2.2.18 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.2.18/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | @@ -382,10 +382,9 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | fireflyiii/core | latest | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [✔️](https://dev.azure.com/Firefly-III/66fb773b-063e-42d7-b6a5-e7729a22e8b3/_apis/git/repositories/e9c3dcf8-4533-4ef1-83cc-75527cab3377/items?path=%2FDockerfile&versionDescriptor%5BversionOptions%5D=0&versionDescriptor%5BversionType%5D=0&versionDescriptor%5Bversion%5D=main&resolveLfs=true&%24format=octetStream&api-version=5.0&download=true) | [Github](https://dev.azure.com/Firefly-III/_git/MainImage) - [DockerHub](https://hub.docker.com/r/fireflyiii/core) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | -| lightninglabs/lightning-terminal | v0.6.0-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | +| lightninglabs/lightning-terminal | v0.6.1-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | sphinxlightning/sphinx-relay | v2.2.0 | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/stakwork/sphinx-relay/v2.2.0/Dockerfile) | [Github](https://github.com/stakwork/sphinx-relay) - [DockerHub](https://hub.docker.com/r/sphinxlightning/sphinx-relay) | | dennisreimann/tallycoin_connect | v1.7.0 | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/dennisreimann/tallycoin_connect/v1.7.0/Dockerfile.arm64v8) | [Github](https://github.com/dennisreimann/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/dennisreimann/tallycoin_connect) | -| lightninglabs/lightning-terminal | v0.6.1-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.12.31 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.31/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | | btcpayserver/docker-woocommerce | 3.0.15 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.15/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f8001d970..42dfac5aa 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -258,18 +258,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.6/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.3.7/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.3.6$?" +echo "Building btcpayserver/btcpayserver:1.3.7$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.3.6 +git checkout v1.3.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.6$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.3.7$?" . cd - && cd .. @@ -448,14 +448,14 @@ cd - && cd .. # Build docker-monacoin -# https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile -DOCKERFILE="monacoin/0.17.1/Dockerfile" -echo "Building wakiyamap/docker-monacoin:0.17.1" +# https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.20.2/Dockerfile +DOCKERFILE="monacoin/0.20.2/Dockerfile" +echo "Building wakiyamap/docker-monacoin:0.20.2" git clone https://github.com/wakiyamap/docker-bitcoin docker-monacoin cd docker-monacoin git checkout master cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "wakiyamap/docker-monacoin:0.17.1" . +docker build -f "$DOCKERFILE" -t "wakiyamap/docker-monacoin:0.20.2" . cd - && cd .. @@ -766,14 +766,14 @@ cd - && cd .. # Build lightning-terminal -# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.0-alpha/Dockerfile +# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile DOCKERFILE="Dockerfile" -echo "Building lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" +echo "Building lightninglabs/lightning-terminal:v0.6.1-alpha-path-prefix" git clone https://github.com/lightninglabs/lightning-terminal lightning-terminal cd lightning-terminal -git checkout v0.6.0-alpha +git checkout v0.6.1-alpha cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.0-alpha-path-prefix" . +docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.1-alpha-path-prefix" . cd - && cd .. @@ -839,18 +839,6 @@ docker build -f "$DOCKERFILE" -t "dennisreimann/tallycoin_connect:v1.7.0" . cd - && cd .. -# Build lightning-terminal -# https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.6.1-alpha/Dockerfile -DOCKERFILE="Dockerfile" -echo "Building lightninglabs/lightning-terminal/v0.6.1-alpha-path-prefix" -git clone https://github.com/lightninglabs/lightning-terminal.git lightning-terminal -cd lightning-terminal -git checkout v0.6.1-alpha -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.6.1-alpha-path-prefix" . -cd - && cd .. - - # Build python-teos # https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile DOCKERFILE="docker/Dockerfile" diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index a95daa2cb..9f3106627 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.3.6$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.3.7$?} expose: - "49392" environment: From 4c038bc3bd8a8478642be0528e5a807e55b29a26 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Sun, 19 Dec 2021 10:30:49 +0100 Subject: [PATCH 134/134] bump liquid --- docker-compose-generator/docker-fragments/liquid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/liquid.yml b/docker-compose-generator/docker-fragments/liquid.yml index 12dc6f8b5..1a3f86fbb 100644 --- a/docker-compose-generator/docker-fragments/liquid.yml +++ b/docker-compose-generator/docker-fragments/liquid.yml @@ -4,7 +4,7 @@ services: elementsd_liquid: restart: unless-stopped container_name: btcpayserver_elementsd_liquid - image: btcpayserver/elements:0.18.1.12 + image: btcpayserver/elements:0.21.0.1 environment: ELEMENTS_NETWORK: ${NBITCOIN_NETWORK:-regtest} ELEMENTS_MAINNET_CHAIN: "liquidv1"