Browse Source

Revert "Bump RTL (#273)"

This reverts commit b12e08cc72.
master
nicolas.dorier 5 years ago
parent
commit
310b0a3882
No known key found for this signature in database GPG Key ID: 6618763EF09186FE
  1. 2
      README.md
  2. 24
      contrib/build-all-images.sh
  3. 5
      docker-compose-generator/docker-fragments/bitcoin-clightning.yml
  4. 4
      docker-compose-generator/docker-fragments/bitcoin-lnd.yml

2
README.md

@ -317,7 +317,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| shesek/lightning-charge | 0.4.16-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.16/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.16/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.16/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.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.7 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) |
| 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.161 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.161/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.161/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.161/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
| nicolasdorier/nbxplorer | 2.1.11 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.11/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.11/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.11/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |

24
contrib/build-all-images.sh

@ -126,18 +126,18 @@ cd - && cd ..
# Build rtl
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile
DOCKERFILE="Dockerfile"
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm32v7
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm32v7
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7"
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm64v8
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.3/Dockerfile.arm64v8
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8"
echo "Building shahanafarooqui/rtl:0.6.7"
echo "Building shahanafarooqui/rtl:0.6.3"
git clone https://github.com/ShahanaFarooqui/RTL rtl
cd rtl
git checkout v0.6.7
git checkout v0.6.3
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.6.7" .
docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.6.3" .
cd - && cd ..
@ -170,18 +170,18 @@ cd - && cd ..
# Build rtl
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.4/Dockerfile
DOCKERFILE="Dockerfile"
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm32v7
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.4/Dockerfile.arm32v7
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7"
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.6.7/Dockerfile.arm64v8
# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.5.4/Dockerfile.arm64v8
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8"
echo "Building shahanafarooqui/rtl:0.6.7"
echo "Building shahanafarooqui/rtl:0.5.4"
git clone https://github.com/ShahanaFarooqui/RTL rtl
cd rtl
git checkout v0.6.7
git checkout v0.5.4
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.6.7" .
docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.5.4" .
cd - && cd ..

5
docker-compose-generator/docker-fragments/bitcoin-clightning.yml

@ -68,14 +68,13 @@ services:
- "3001"
bitcoin_rtl:
image: shahanafarooqui/rtl:0.6.7
image: shahanafarooqui/rtl:0.6.3
restart: unless-stopped
environment:
LN_IMPLEMENTATION: CLT
CONFIG_PATH: /root/.lightning/config
LN_SERVER_URL: http://clightning_bitcoin_rest:3001/v1
MACAROON_PATH: /etc/clightning_bitcoin_rest/certs
RTL_CONFIG_PATH: /data/
RTL_CONFIG_PATH: /data/RTL.conf
BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf
RTL_SSO: 1
RTL_COOKIE_PATH: /data/.cookie

4
docker-compose-generator/docker-fragments/bitcoin-lnd.yml

@ -39,13 +39,13 @@ services:
- bitcoind
bitcoin_rtl:
image: shahanafarooqui/rtl:0.6.7
image: shahanafarooqui/rtl:0.5.4
restart: unless-stopped
environment:
LND_SERVER_URL: http://lnd_bitcoin:8080/v1
MACAROON_PATH: /etc/lnd
RTL_CONFIG_PATH: /data/
LND_CONFIG_PATH: /etc/lnd/lnd.conf
RTL_CONFIG_PATH: /data/RTL.conf
BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf
RTL_SSO: 1
RTL_COOKIE_PATH: /data/.cookie

Loading…
Cancel
Save