diff --git a/README.md b/README.md index 49f313d..b558848 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 5a77ed4..1dbbc4f 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 2a39aa1..5c48422 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 @@ namespace DockerFileBuildHelper 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 bdf6d33..776dd08 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 ..