Merge pull request #31 from mayankchhabra/new-pwd-patch

Further changes for #28

build/tor/Dockerfile

@@ -1,10 +0,0 @@
-FROM alpine:3.11
-
-RUN apk add --no-cache tor
-
-VOLUME /etc/tor/
-VOLUME /var/lib/tor/
-
-EXPOSE 9050 9051 29050 29051
-
-ENTRYPOINT ["tor"]

build/volume-permissions/Dockerfile

@@ -1,21 +0,0 @@
-ARG IMG
-ARG VER
-
-FROM ${IMG}:${VER}
-
-ARG ID=1000
-ARG DIR=/data/
-
-RUN addgroup --gid ${ID} lncm
-
-RUN adduser  --uid ${ID} \
-             --home ${DIR} \
-             --disabled-password \
-             --gecos "" \
-             --ingroup lncm \
-             lncm
-
-USER lncm
-
-VOLUME ${DIR}
-

configure-box.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -70,12 +70,17 @@ if [ -z $TESTNET ] && [ -z $REGTEST ]; then
     echo "Setting mainnet RPC port in docker-compose"
     sed -i 's/RPCPORT/18443/g; ' docker-compose.yml
 fi
+
+echo "Pulling Docker images"
+docker-compose pull
+
 echo "Adding tor password"
-SAVE_PASSWORD=`tor --hash-password "${RPCPASS}"`
+SAVE_PASSWORD=`docker run -it getumbrel/tor:v0.4.1.9 --quiet --hash-password "${RPCPASS}"`
 echo "HashedControlPassword ${SAVE_PASSWORD}" >> tor/torrc
-echo "Configuring bitcoind"
+
+echo "Adding Tor password to bitcoind"
 sed -i "s/torpassword=umbrelftw/torpassword=${RPCPASS}/g;" bitcoin/bitcoin.conf
-echo "Configuring LND"
+echo "Adding Tor password to LND"
 sed -i "s/tor.password=umbrelftw/tor.password=${RPCPASS}/g; " lnd/lnd.conf
 
 rm configure-box.sh

docker-compose.yml

@@ -11,7 +11,7 @@ x-utility: &default-utility
 
 services:
         tor:
-                build: ${PWD}/build/tor/ 
+                image: getumbrel/tor:v0.4.1.9
                 restart: on-failure
                 logging: *default-logging
                 volumes:

install-box.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -e
 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF