From cfde4bfae5f9045331987dbd0942a9f2e5c6cf2f Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Wed, 22 Jul 2020 14:38:44 +0200 Subject: [PATCH] Add RTL for Eclair (#336) * Add RTL for Eclair Still need @acinq to bump their docker images though * Update eclair --- README.md | 2 +- contrib/build-all-images.sh | 24 ++++++++++++++--- .../docker-fragments/bitcoin-eclair.yml | 27 +++++++++++++++++-- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2835f51..85ebff0 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | postgres | 9.6.5 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | -| acinq/eclair | v0.3.3 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.3.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | +| acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/release-0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | | dalijolijo/docker-bitcore | 0.15.2 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | | btcpayserver/dash | 0.14.0.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 7ca07d3..095e8e6 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -142,14 +142,30 @@ cd - && cd .. # Build eclair -# https://raw.githubusercontent.com/ACINQ/eclair/v0.3.3/Dockerfile +# https://raw.githubusercontent.com/ACINQ/eclair/release-0.4.1/Dockerfile DOCKERFILE="Dockerfile" -echo "Building acinq/eclair:v0.3.3" +echo "Building acinq/eclair:release-0.4.1" git clone https://github.com/ACINQ/eclair eclair cd eclair -git checkout v0.3.3 +git checkout release-0.4.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "acinq/eclair:v0.3.3" . +docker build -f "$DOCKERFILE" -t "acinq/eclair:release-0.4.1" . +cd - && cd .. + + +# Build rtl +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile +DOCKERFILE="Dockerfile" +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm32v7 +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm64v8 +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" +echo "Building shahanafarooqui/rtl:0.8.2" +git clone https://github.com/ShahanaFarooqui/RTL rtl +cd rtl +git checkout v0.8.2 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.8.2" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 82f2505..24f4484 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -9,7 +9,7 @@ services: container_name: btcpayserver_eclair_bitcoin restart: unless-stopped stop_signal: SIGINT - image: acinq/eclair:v0.3.3 + image: acinq/eclair:release-0.4.1 environment: PUBLIC_HOST: ${BTCPAY_HOST} JAVA_OPTS: | @@ -39,11 +39,34 @@ services: - "eclair_bitcoin_datadir:/data" links: - bitcoind + + bitcoin_rtl: + image: shahanafarooqui/rtl:0.8.2 + restart: unless-stopped + environment: + LN_IMPLEMENTATION: ECL + LN_SERVER_URL: http://eclair_bitcoin:8080 + LN_API_PASSWORD: DwubwWsoo3 + BITCOIND_CONFIG_PATH: /etc/bitcoin/bitcoin.conf + RTL_SSO: 1 + RTL_COOKIE_PATH: /data/.cookie + LOGOUT_REDIRECT_LINK: /server/services + volumes: + - "bitcoin_datadir:/etc/bitcoin" + - "eclair_bitcoin_datadir:/etc/eclair" + - "eclair_bitcoin_rtl_datadir:/data" + expose: + - "3000" + links: + - eclair_bitcoin + btcpayserver: environment: BTCPAY_BTCLIGHTNING: "type=eclair;server=http://eclair_bitcoin:8080;password=DwubwWsoo3" + BTCPAY_BTCEXTERNALRTL: "server=/rtl/api/authenticate/cookie;cookiefile=/etc/eclair_bitcoin_rtl/.cookie" volumes: - "eclair_bitcoin_datadir:/etc/eclair_bitcoin" + - "eclair_bitcoin_rtl_datadir:/etc/eclair_bitcoin_rtl" links: - eclair_bitcoin volumes: @@ -53,4 +76,4 @@ incompatible: - pruning required: - "opt-add-zmq" - - "opt-txindex" \ No newline at end of file + - "opt-txindex"