diff --git a/README.md b/README.md index a2db7fc..9715971 100644 --- a/README.md +++ b/README.md @@ -342,7 +342,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose | 1.28.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/docker-compose/1.28.6/docker-compose/1.28.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose) | -| btcpayserver/lightning | v0.10.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| btcpayserver/lightning | v22.11 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v22.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v22.11/contrib/docker/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v22.11/contrib/docker/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.9.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.9.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.9.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.9.0/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index bc51e06..22146b8 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -321,8 +321,8 @@ namespace DockerFileBuildHelper break; case "lightning": dockerInfo.DockerFilePath = $"Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = "contrib/linuxarm32v7.Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = "contrib/linuxarm64v8.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "contrib/docker/linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "contrib/docker/linuxarm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/lightning"; dockerInfo.GitRef = $"basedon-{image.Tag}"; dockerInfo.SupportedByUs = true; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 80f4ba4..2a930f3 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v22.11/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.10.2/contrib/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.10.2" +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v22.11/contrib/docker/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/docker/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v22.11/contrib/docker/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/docker/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/lightning:v22.11" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.10.2 +git checkout basedon-v22.11 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.10.2" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v22.11" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 7ae4d78..2bcecb8 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_bitcoin: - image: btcpayserver/lightning:v0.10.2 + image: btcpayserver/lightning:v22.11 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: @@ -16,6 +16,7 @@ services: bitcoin-datadir=/etc/bitcoin bitcoin-rpcconnect=bitcoind experimental-offers + database-upgrade=true volumes: - "clightning_bitcoin_datadir:/root/.lightning" - "bitcoin_datadir:/etc/bitcoin"