diff --git a/README.md b/README.md index 18eb107..54d7028 100644 --- a/README.md +++ b/README.md @@ -345,7 +345,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.3-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.3-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.3-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.18.3-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | btcpayserver/bitcoin | 26.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/26.0/Bitcoin/26.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/btcpayserver | 1.13.7$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.7/Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| btcpayserver/btcpayserver | 2.0.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.5/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) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 0c33287..dca5916 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -468,8 +468,7 @@ namespace DockerFileBuildHelper dockerInfo.DockerFilePathARM32v7 = "Dockerfile"; dockerInfo.DockerFilePathARM64v8 = "Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/btcpayserver"; - // v1.0.5.4$ - dockerInfo.GitRef = $"v{image.Tag.Substring(0, image.Tag.IndexOf('$'))}"; + dockerInfo.GitRef = $"v{image.Tag}"; dockerInfo.SupportedByUs = true; break; case "rtl": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index eb69c49..3c9f7c9 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/v1.13.7/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.5/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.7/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.5/Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.13.7/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v2.0.5/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" -echo "Building btcpayserver/btcpayserver:1.13.7$?" +echo "Building btcpayserver/btcpayserver:2.0.5" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.13.7 +git checkout v2.0.5 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.13.7$?" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:2.0.5" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 1761633..44090e7 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:1.13.7$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:2.0.5} expose: - "49392" environment: diff --git a/docker-compose-generator/src/Program.cs b/docker-compose-generator/src/Program.cs index bdb0e21..661a970 100644 --- a/docker-compose-generator/src/Program.cs +++ b/docker-compose-generator/src/Program.cs @@ -83,11 +83,6 @@ namespace DockerGenerator } } - if (hasAltcoins) - Environment.SetEnvironmentVariable("BTCPAY_BUILD_CONFIGURATION", "-altcoins"); - else - Environment.SetEnvironmentVariable("BTCPAY_BUILD_CONFIGURATION", ""); - foreach (var fragment in composition.AdditionalFragments) { fragments.Add(fragment);