diff --git a/README.md b/README.md index 71d8bd5..50b630e 100644 --- a/README.md +++ b/README.md @@ -305,7 +305,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/docker-compose-builder | 1.24.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-compose-builder) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-builder) | | btcpayserver/bitcoin | 0.18.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.18.0/Bitcoin/0.18.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/lightning | v0.7.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.3/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.3/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | -| shesek/lightning-charge | 0.4.6-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.6/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | +| shesek/lightning-charge | 0.4.11-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.11/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.11/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) | | btcpayserver/lnd | v0.7.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | shahanafarooqui/rtl | 0.5.1 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.1/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.1/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 827e90d..5fea3e0 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -273,6 +273,8 @@ namespace DockerFileBuildHelper break; case "lightning-charge": dockerInfo.DockerFilePath = $"Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/ElementsProject/lightning-charge"; dockerInfo.GitRef = $"v{image.Tag.Replace("-standalone", "")}"; dockerInfo.SupportedByUs = true; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 080e1e0..33bae74 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -78,14 +78,18 @@ cd - && cd .. # Build lightning-charge -# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.6/Dockerfile +# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.11/Dockerfile DOCKERFILE="Dockerfile" -echo "Building shesek/lightning-charge:0.4.6-standalone" +# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.11/arm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" +# https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.11/arm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" +echo "Building shesek/lightning-charge:0.4.11-standalone" git clone https://github.com/ElementsProject/lightning-charge lightning-charge cd lightning-charge -git checkout v0.4.6 +git checkout v0.4.11 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shesek/lightning-charge:0.4.6-standalone" . +docker build -f "$DOCKERFILE" -t "shesek/lightning-charge:0.4.11-standalone" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 2f7f5fe..7cce51a 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -24,7 +24,7 @@ services: links: - bitcoind clightning_bitcoin_charge: - image: shesek/lightning-charge:0.4.6-standalone + image: shesek/lightning-charge:0.4.11-standalone restart: unless-stopped environment: NETWORK: ${NBITCOIN_NETWORK:-regtest}