diff --git a/build/Dockerfile b/build/Dockerfile index 4034658..ddacd50 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,7 +1,7 @@ FROM node:10.15.3-alpine as build -ENV LND_VERSION "v0.7.1-beta" -ENV RTL_TAG "v0.4.4" +ENV LND_VERSION "v0.8.1-beta" +ENV RTL_TAG "v0.5.4" RUN apk add --no-cache wget ca-certificates \ && wget https://github.com/lightningnetwork/lnd/releases/download/${LND_VERSION}/lnd-linux-amd64-${LND_VERSION}.tar.gz \ @@ -13,7 +13,7 @@ RUN apk add --no-cache wget ca-certificates \ RUN apk add --no-cache \ bash curl openssl supervisor git make g++ -RUN git clone -b $RTL_TAG https://github.com/ShahanaFarooqui/RTL.git /rtl +RUN git clone -b $RTL_TAG https://github.com/Ride-The-Lightning/RTL.git /rtl WORKDIR /rtl diff --git a/build/src/scripts/start-rtl.sh b/build/src/scripts/start-rtl.sh index b47bdae..225bec2 100755 --- a/build/src/scripts/start-rtl.sh +++ b/build/src/scripts/start-rtl.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash set -e +# Create restore symlink +if [ ! -f /rtl/backup/restore ]; then + ln -s /rtl/backup /rtl/backup/restore +fi + # Configure settings from env vars envsubst < "source_RTL.conf" > "RTL.conf" diff --git a/dappnode_package.json b/dappnode_package.json index 7b6f80c..d3b0f21 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,27 +1,28 @@ { "name": "lightning-network.dnp.dappnode.eth", - "version": "0.1.1", - "upstreamVersion": "v0.7.0-beta", + "version": "0.1.2", + "upstreamVersion": "v0.8.1-beta", "shortDescription": "Scalable, instant Bitcoin transactions", "description": "The Lightning Network DAppNodePackage (lnd + RTL). The Lightning Network is a decentralized system for instant, high-volume micropayments that remove the risk of delegating custody of funds to trusted third parties. \n\n\n **Getting started** \n\n Go to the [Lightning Network DAppNode Package readme](https://github.com/dappnode/DAppNodePackage-LightningNetwork#readme) to learn how to get started and safely backup your data.", "avatar": "/ipfs/QmYjbpLBEbPDoiJwTcWjhuHuL1Ax2HuArhXRF4Fi95HT6c", "type": "service", "image": { - "path": "", - "hash": "", - "size": "", + "path": "lightning-network.dnp.dappnode.eth_0.1.2.tar.xz", + "hash": "/ipfs/QmSW5TRfcyQuZTv69UsUJ4jBGb3KkZENq9LrnZxU7jPStL", + "size": 99651400, "ports": [ "9735:9735" ], "volumes": [ - "lndconfig_data:/root/.lnd/" + "lndconfig_data:/root/.lnd/", + "lndconfig_backup:/rtl/backup/" ], "restart": "always", "environment": [ "RTL_PASSWORD=changeme", "RPCUSER=dappnode", "RPCPASS=dappnode", - "BITCOIND_HOST=my.bitcoin.dnp.dappnode.eth", + "BITCOIND_HOST=bitcoin.dappnode", "NETWORK=mainnet", "ALIAS=", "COLOR=#5ACDC5", @@ -33,8 +34,16 @@ }, "backup": [ { - "name": "data", - "path": "/root/.lnd" + "name": "rtl-channel", + "path": "/rtl/backup/" + }, + { + "name": "lnd-channel", + "path": "/root/.lnd/data/chain/bitcoin/mainnet/channel.backup" + }, + { + "name": "wallet", + "path": "/root/.lnd/data/chain/bitcoin/mainnet/wallet.db" } ], "style": { @@ -72,4 +81,4 @@ "message": "This software is experimental, presented 'as is' and inherently carries risks. By installing it, you acknowledge that DAppNode Association has done its best to mitigate these risks and accept to waive any liability or responsibility for DAppNode in case of any shortage, discrepancy, damage, loss or destruction of any digital asset managed within this DAppNode package.\n\nThis package stores private keys, which will be stored in your DAppNode. Neither DAppNode Association nor the developers of this software can have access to your private key, nor help you recover it if you lose it. \n\nYou are solely responsible for keeping your private keys and password safe and to perform secure backups, as well as to restrict access to your computer and other equipment. To the extent permitted by applicable law, you agree to be responsible for all activities that have been conducted from your account. You must take all necessary steps to ensure that your private key, password, and/or recovery phrase remain confidential and secured." }, "license": "GPL-3.0" -} +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 97c931e..ace2b3d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: lightning-network.dnp.dappnode.eth: - image: 'lightning-network.dnp.dappnode.eth:0.0.3' + image: 'lightning-network.dnp.dappnode.eth:0.1.2' build: ./build volumes: - 'lndconfig_data:/root/.lnd/'