From 187042c830f87b3e31078e6442eb86f40a1e3abe Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 27 May 2025 22:48:16 +0900 Subject: [PATCH] update doc --- README.md | 2 ++ contrib/DockerFileBuildHelper/Program.cs | 19 ++++++++++++++ contrib/build-all-images.sh | 32 ++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/README.md b/README.md index 8d5196a..10bc752 100644 --- a/README.md +++ b/README.md @@ -348,6 +348,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/bitcoinknots | 28.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/BitcoinKnots/28.1/BitcoinKnots/28.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/BitcoinKnots/28.1/BitcoinKnots/28.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/BitcoinKnots/28.1/BitcoinKnots/28.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoinknots) | | btcpayserver/btcpayserver | 2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.1.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.1.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.1.1/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.26 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.26/Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.26/Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.5.26/Dockerfile) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | @@ -365,6 +366,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | 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) | +| acinq/phoenixd | 0.6.0 | [✔️](https://raw.githubusercontent.com/ACINQ/phoenixd/v0.6.0/.docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/ACINQ/phoenixd/v0.6.0/.docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/ACINQ/phoenixd/v0.6.0/.docker/Dockerfile) | [Github](https://github.com/ACINQ/phoenixd) - [DockerHub](https://hub.docker.com/r/acinq/phoenixd) | | btcpayserver/postgres | 13.18 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.18/Postgres/13.18/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.18/Postgres/13.18/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.18/Postgres/13.18/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/postgres) | | 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) | | 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) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index d3214de..22ef4e8 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -422,6 +422,14 @@ namespace DockerFileBuildHelper dockerInfo.GitLink = "https://github.com/ChekaZ/docker"; dockerInfo.GitRef = "master"; break; + case "phoenixd": + dockerInfo.DockerFilePath = ".docker/Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = ".docker/Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = ".docker/Dockerfile"; + dockerInfo.GitLink = "https://github.com/ACINQ/phoenixd"; + dockerInfo.GitRef = $"v{image.Tag}"; + dockerInfo.SupportedByUs = true; + break; case "lnd": dockerInfo.DockerFilePath = "linuxamd64.Dockerfile"; dockerInfo.DockerFilePathARM32v7 = "linuxarm32v7.Dockerfile"; @@ -455,6 +463,17 @@ namespace DockerFileBuildHelper dockerInfo.SupportedByUs = true; break; } + case "bitcoinknots": + { + var tagNoRevision = image.Tag.Split('-').First(); + dockerInfo.DockerFilePath = $"BitcoinKnots/{tagNoRevision}/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = $"BitcoinKnots/{tagNoRevision}/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"BitcoinKnots/{tagNoRevision}/linuxarm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"BitcoinKnots/{image.Tag}"; + 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 702128a..d6a830d 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -153,6 +153,22 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:27.1" . cd - && cd .. +# Build bitcoinknots +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/BitcoinKnots/28.1/BitcoinKnots/28.1/linuxamd64.Dockerfile +DOCKERFILE="BitcoinKnots/28.1/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/BitcoinKnots/28.1/BitcoinKnots/28.1/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="BitcoinKnots/28.1/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/BitcoinKnots/28.1/BitcoinKnots/28.1/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="BitcoinKnots/28.1/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/bitcoinknots:28.1" +git clone https://github.com/btcpayserver/dockerfile-deps bitcoinknots +cd bitcoinknots +git checkout BitcoinKnots/28.1 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoinknots:28.1" . +cd - && cd .. + + # Build docker-bitcoinplus # https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile DOCKERFILE="bitcoinplus/2.7.0/Dockerfile" @@ -1139,6 +1155,22 @@ docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" . cd - && cd .. +# Build phoenixd +# https://raw.githubusercontent.com/ACINQ/phoenixd/v0.6.0/.docker/Dockerfile +DOCKERFILE=".docker/Dockerfile" +# https://raw.githubusercontent.com/ACINQ/phoenixd/v0.6.0/.docker/Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE=".docker/Dockerfile" +# https://raw.githubusercontent.com/ACINQ/phoenixd/v0.6.0/.docker/Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE=".docker/Dockerfile" +echo "Building acinq/phoenixd:0.6.0" +git clone https://github.com/ACINQ/phoenixd phoenixd +cd phoenixd +git checkout v0.6.0 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "acinq/phoenixd:0.6.0" . +cd - && cd .. + + # Build postgres # https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Postgres/13.18/Postgres/13.18/linuxamd64.Dockerfile DOCKERFILE="Postgres/13.18/linuxamd64.Dockerfile"