From d01d6f45af2a5841d449b4e7d4f96746b7d0c668 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 2 Mar 2019 13:39:13 +0900 Subject: [PATCH] bump clightning to 0.7.0 --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 2 +- contrib/build-all-images.sh | 24 +++++++++---------- .../docker-fragments/bitcoin-clightning.yml | 2 +- .../docker-fragments/litecoin-clightning.yml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c848802..ab938c3 100644 --- a/README.md +++ b/README.md @@ -311,7 +311,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) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | * | btcpayserver/docker-compose-builder | 1.23.2 | ️❌ | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.23.2/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-compose-builder) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-builder) | | bitcoin.yml | btcpayserver/bitcoin | 0.17.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.17.0/Bitcoin/0.17.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.17.0/Bitcoin/0.17.0/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| bitcoin-clightning.yml | btcpayserver/lightning | v0.6.3-4 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| bitcoin-clightning.yml | btcpayserver/lightning | v0.7.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/contrib/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | bitcoin-clightning.yml | 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) | | bitcoin-clightning.yml | shesek/spark-wallet | 0.2.4-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.4/Dockerfile) | ️❌ | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | | bitcoin-lnd.yml | btcpayserver/lnd | v0.5.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.2-beta/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | @@ -325,7 +325,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | groestlcoin-clightning.yml | groestlcoin/groestlcoin-lightning-charge | version-0.4.7 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.7/Dockerfile) | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) | | groestlcoin-clightning.yml | groestlcoin/groestlcoin-spark | version-0.2.4 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.4/Dockerfile) | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) | | litecoin.yml | nicolasdorier/docker-litecoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/litecoin/0.16.3/Dockerfile) | ️❌ | [Github](https://github.com/NicolasDorier/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/nicolasdorier/docker-litecoin) | -| litecoin-clightning.yml | btcpayserver/lightning | v0.6.3-4 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| litecoin-clightning.yml | btcpayserver/lightning | v0.7.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/contrib/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | litecoin-lnd.yml | btcpayserver/lnd | v0.5.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.2-beta/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | monacoin.yml | wakiyamap/docker-monacoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.16.3/Dockerfile) | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | | nbxplorer.yml | nicolasdorier/nbxplorer | 2.0.0.13 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.13/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.13/Dockerfile.linuxarm32v7) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 3166376..035286e 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -259,7 +259,7 @@ namespace DockerFileBuildHelper break; case "lightning": dockerInfo.DockerFilePath = $"Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = "linuxarm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "contrib/linuxarm32v7.Dockerfile"; dockerInfo.GitLink = "https://github.com/btcpayserver/lightning"; dockerInfo.GitRef = $"basedon-{image.Tag}"; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 3fe4add..078f7b8 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -59,16 +59,16 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -echo "Building btcpayserver/lightning:v0.6.3-4" +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/contrib/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" +echo "Building btcpayserver/lightning:v0.7.0" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.6.3-4 +git checkout basedon-v0.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.6.3-4" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.7.0" . cd - && cd .. @@ -267,16 +267,16 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -echo "Building btcpayserver/lightning:v0.6.3-4" +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0/contrib/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" +echo "Building btcpayserver/lightning:v0.7.0" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.6.3-4 +git checkout basedon-v0.7.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.6.3-4" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.7.0" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index e2050d0..eeb8a01 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.6.3-4 + image: btcpayserver/lightning:v0.7.0 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml index fd35f0f..4cca378 100644 --- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_litecoin: - image: btcpayserver/lightning:v0.6.3-4 + image: btcpayserver/lightning:v0.7.0 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: