AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

switch to official clightning rest image (#259)

Browse Source
This commit is contained in:
Andrew Camilleri
2020-01-21 10:15:17 +01:00
committed by Nicolas Dorier
parent f0503637f3
commit f06964cc99
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -310,7 +310,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| btcpayserver/lightning | v0.8.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.0/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.0/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) |
| 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) |
| kukks/clightning-rest | 0.2.0 | [✔️](https://raw.githubusercontent.com/kukks/c-lightning-REST/v0.2.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/c-lightning-REST/v0.2.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/kukks/c-lightning-REST/v0.2.0/arm64v8.Dockerfile) | [Github](https://github.com/kukks/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/kukks/clightning-rest) |
| saubyk/c-lightning-rest | 0.2.1 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/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.6.3 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) |
| btcpayserver/lnd | v0.8.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.8.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.8.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.8.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) |
| btcpayserver/btcpayserver | 1.0.3.154 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.154/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.154/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.154/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |

4
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -506,11 +506,11 @@ namespace DockerFileBuildHelper
dockerInfo.GitRef = $"v{image.Tag.Split('-')[0]}";
dockerInfo.SupportedByUs = true;
break;
case "clightning-rest":
case "c-lightning-rest":
dockerInfo.DockerFilePath = $"amd64.Dockerfile";
dockerInfo.DockerFilePathARM32v7 = $"arm32v7.Dockerfile";
dockerInfo.DockerFilePathARM64v8 = $"arm64v8.Dockerfile";
dockerInfo.GitLink = "https://github.com/kukks/c-lightning-REST";
dockerInfo.GitLink = "https://github.com/Ride-The-Lightning/c-lightning-REST";
dockerInfo.GitRef = $"v{image.Tag.Split('-')[0]}";
dockerInfo.SupportedByUs = true;
break;

18
contrib/build-all-images.sh
View File

@@ -109,19 +109,19 @@ docker build -f "$DOCKERFILE" -t "shesek/spark-wallet:0.2.9-standalone" .
cd - && cd ..
# Build clightning-rest
# https://raw.githubusercontent.com/kukks/c-lightning-REST/v0.2.0/amd64.Dockerfile
# Build c-lightning-rest
# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/amd64.Dockerfile
DOCKERFILE="amd64.Dockerfile"
# https://raw.githubusercontent.com/kukks/c-lightning-REST/v0.2.0/arm32v7.Dockerfile
# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/arm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile"
# https://raw.githubusercontent.com/kukks/c-lightning-REST/v0.2.0/arm64v8.Dockerfile
# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.2.1/arm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile"
echo "Building kukks/clightning-rest:0.2.0"
git clone https://github.com/kukks/c-lightning-REST clightning-rest
cd clightning-rest
git checkout v0.2.0
echo "Building saubyk/c-lightning-rest:0.2.1"
git clone https://github.com/Ride-The-Lightning/c-lightning-REST c-lightning-rest
cd c-lightning-rest
git checkout v0.2.1
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "kukks/clightning-rest:0.2.0" .
docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.2.1" .
cd - && cd ..

2
docker-compose-generator/docker-fragments/bitcoin-clightning.yml
View File

@@ -53,7 +53,7 @@ services:
- "9737"
clightning_bitcoin_rest:
image: kukks/clightning-rest:0.2.0
image: saubyk/c-lightning-rest:0.2.1
restart: unless-stopped
environment:
PROTOCOL: "http"