diff --git a/README.md b/README.md index 651ffe6..c224500 100644 --- a/README.md +++ b/README.md @@ -340,7 +340,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.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.12.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/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.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/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/btcpayserver | 1.4.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.4.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.4.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.4.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 7bf2241..378a28f 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -441,18 +441,18 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"v{image.Tag.Substring(0, image.Tag.IndexOf('$'))}"; dockerInfo.SupportedByUs = true; break; - case "rtl" when image.Tag != "0.10.0" && image.Tag != "0.11.2": - dockerInfo.DockerFilePath = "dockerfiles/Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = "dockerfiles/Dockerfile.arm32v7"; - dockerInfo.DockerFilePathARM64v8 = "dockerfiles/Dockerfile.arm64v8"; + 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" when image.Tag == "0.11.2": - dockerInfo.DockerFilePath = "docker/Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = "docker/Dockerfile.arm32v7"; - dockerInfo.DockerFilePathARM64v8 = "docker/Dockerfile.arm64v8"; + case "rtl": + dockerInfo.DockerFilePath = "Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "Dockerfile.arm32v7"; + dockerInfo.DockerFilePathARM64v8 = "Dockerfile.arm64v8"; dockerInfo.GitLink = "https://github.com/ShahanaFarooqui/RTL"; dockerInfo.GitRef = $"v{image.Tag}"; dockerInfo.SupportedByUs = true; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 6589b45..2a72c87 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.12.1/dockerfiles/Dockerfile -DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.12.1" +# 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.2/docker/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" +# 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.2" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.12.1 +git checkout v0.11.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.1" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.11.2" . cd - && cd .. @@ -154,14 +154,14 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.11.2/docker/Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.11.2/docker/Dockerfile DOCKERFILE="docker/Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.11.2/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/ShahanaFarooqui/RTL/v0.11.2/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.2" -git clone https://github.com/ShahanaFarooqui/RTL rtl +git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl git checkout v0.11.2 cd "$(dirname $DOCKERFILE)" @@ -186,18 +186,18 @@ cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile -DOCKERFILE="dockerfiles/Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile.arm32v7 -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm32v7" -# https://raw.githubusercontent.com/Ride-The-Lightning/RTL/v0.12.1/dockerfiles/Dockerfile.arm64v8 -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="dockerfiles/Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.12.1" +# 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.2/docker/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="docker/Dockerfile.arm32v7" +# 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.2" git clone https://github.com/Ride-The-Lightning/RTL rtl cd rtl -git checkout v0.12.1 +git checkout v0.11.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.12.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 106f97c..298d155 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -72,7 +72,7 @@ services: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.12.1 + image: shahanafarooqui/rtl:0.11.2 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index c722819..81e221f 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.12.1 + image: shahanafarooqui/rtl:0.11.2 restart: unless-stopped environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1