From 2ae3621bfdfa553d9d9c323f28d3cfcfa57e8593 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 8 Mar 2025 22:35:59 +0900 Subject: [PATCH] bump btcpay --- README.md | 4 +- contrib/DockerFileBuildHelper/Program.cs | 16 ++++++++ contrib/build-all-images.sh | 40 ++++++++++++++++--- .../docker-fragments/btcpayserver.yml | 2 +- 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4a7f1da..a3af70e 100644 --- a/README.md +++ b/README.md @@ -346,7 +346,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | shahanafarooqui/rtl | v0.15.4 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.15.4/Dockerfile) | [Github](https://github.com/Ride-The-Lightning/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | | btcpayserver/lnd | v0.18.5-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.5-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.5-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.5-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcoin | 27.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/27.1/Bitcoin/27.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/27.1/Bitcoin/27.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/27.1/Bitcoin/27.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/btcpayserver | 2.0.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.6/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 2.0.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.7/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/monero | 0.18.3.4 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.4/Monero/0.18.3.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.4/Monero/0.18.3.4/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.4/Monero/0.18.3.4/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | nicolasdorier/nbxplorer | 2.5.16 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.16/Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.16/Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.16/Dockerfile) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 2.2.9-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | @@ -359,6 +359,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | btcpayserver/joinmarket | 0.9.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/JoinMarket/0.9.10/JoinMarket/0.9.10/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 | 2023.05.2 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2023.05.2/src/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | +| btcpayserver/shopify-app-deployer | 1.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile) | [Github](https://github.com/btcpayserver/shopify-app) - [DockerHub](https://hub.docker.com/r/btcpayserver/shopify-app-deployer) | | btcpayserver/snapdrop | 1.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/snapdrop) | | btcpayserver/tor | 0.4.8.10 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.8.10/Tor/0.4.8.10/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.8.10/Tor/0.4.8.10/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.8.10/Tor/0.4.8.10/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | btcpayserver/woocommerce | 3.1.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxamd64.Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/WooCommerce/3.1.0/WooCommerce/3.1.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/woocommerce) | @@ -390,6 +391,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | 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.14.1-alpha-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.14.1-alpha/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.14.1-alpha/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | +| hectorchu1/mwebd | latest | [✔️](https://raw.githubusercontent.com/ltcmweb/btcpayserver-ltcmweb-plugin/main/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ltcmweb/btcpayserver-ltcmweb-plugin) - [DockerHub](https://hub.docker.com/r/hectorchu1/mwebd) | | mempool/frontend | v2.5.0 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/frontend) | | mempool/backend | v2.5.0 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/backend) | | mariadb | 10.11 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.11/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 9b640d9..e766b40 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -291,6 +291,22 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"dcg-latest"; dockerInfo.SupportedByUs = true; break; + case "shopify-app-deployer": + dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/shopify-app"; + dockerInfo.GitRef = image.Tag; + dockerInfo.SupportedByUs = true; + break; + case "mwebd": + dockerInfo.DockerFilePath = "Dockerfile"; + //dockerInfo.DockerFilePath = "Dockerfile"; + //dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.GitLink = "https://github.com/ltcmweb/btcpayserver-ltcmweb-plugin"; + dockerInfo.GitRef = "main"; + dockerInfo.SupportedByUs = false; + break; case "tallycoin_connect": dockerInfo.DockerFilePath = "Dockerfile"; dockerInfo.DockerFilePathARM32v7 = $"Dockerfile.arm32v7"; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index f258970..03bc52e 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -178,18 +178,18 @@ cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.6/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.7/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.6/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.7/Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.6/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.7/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building btcpayserver/btcpayserver:2.0.6" +echo "Building btcpayserver/btcpayserver:2.0.7" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v2.0.6 +git checkout v2.0.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:2.0.6" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:2.0.7" . cd - && cd .. @@ -721,6 +721,18 @@ docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.14.1-alpha cd - && cd .. +# Build mwebd +# https://raw.githubusercontent.com/ltcmweb/btcpayserver-ltcmweb-plugin/main/Dockerfile +DOCKERFILE="Dockerfile" +echo "Building hectorchu1/mwebd:latest" +git clone https://github.com/ltcmweb/btcpayserver-ltcmweb-plugin mwebd +cd mwebd +git checkout main +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "hectorchu1/mwebd:latest" . +cd - && cd .. + + # Build frontend # https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile DOCKERFILE="docker/frontend/Dockerfile" @@ -813,6 +825,22 @@ docker build -f "$DOCKERFILE" -t "pihole/pihole:2023.05.2" . cd - && cd .. +# Build shopify-app-deployer +# https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/shopify-app/1.2/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" +echo "Building btcpayserver/shopify-app-deployer:1.2" +git clone https://github.com/btcpayserver/shopify-app shopify-app-deployer +cd shopify-app-deployer +git checkout 1.2 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "btcpayserver/shopify-app-deployer:1.2" . +cd - && cd .. + + # Build snapdrop # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Snapdrop/1.2/Snapdrop/1.2/Dockerfile DOCKERFILE="Snapdrop/1.2/Dockerfile" diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index fe03997..318fb82 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 container_name: generated_btcpayserver_1 - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:2.0.6} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:2.0.7} expose: - "49392" environment: