Merge pull request #566 from bitcoincoretech/issue_549b

Issue 549b

code/docker/c-lightning/Dockerfile

@@ -5,9 +5,10 @@ RUN apt update && apt install -yqq \
 	software-properties-common
 
 # c-lightning
+ENV C_LIGHTNING_VER 0.9.2~0~ubuntu18.04.1
 RUN add-apt-repository -u ppa:lightningnetwork/ppa
 RUN apt-get install -yqq \
- 	lightningd
+	lightningd=${C_LIGHTNING_VER}
 
 ADD https://raw.githubusercontent.com/ElementsProject/lightning/master/contrib/lightning-cli.bash-completion /usr/share/bash-completion/completions/lightning-cli
 

code/docker/docker-compose.yml

@@ -14,6 +14,7 @@ services:
       - "18443"
       - "12005"
       - "12006"
+    restart: always
 
   Alice:
     container_name: Alice
@@ -24,6 +25,7 @@ services:
       - lnnet
     expose:
       - "9735"
+    restart: always
 
   Bob:
     container_name: Bob
@@ -34,6 +36,7 @@ services:
       - lnnet
     expose:
       - "9735"
+    restart: always
 
   Wei:
     container_name: Wei
@@ -44,6 +47,7 @@ services:
       - lnnet
     expose:
       - "9735"
+    restart: always
 
   Gloria:
     container_name: Gloria
@@ -54,3 +58,4 @@ services:
       - lnnet
     expose:
       - "9735"
+    restart: always

code/docker/eclair/Dockerfile

@@ -9,8 +9,8 @@ RUN apt update && apt install -yqq \
 COPY --from=lnbook/bitcoind /usr/local/ /usr/local/
 
 # Install eclair
-ENV ECLAIR_VER 0.4
-ENV ECLAIR_COMMIT 69c538e
+ENV ECLAIR_VER 0.4.2
+ENV ECLAIR_COMMIT 52444b0
 WORKDIR /usr/src
 RUN curl -sLO https://github.com/ACINQ/eclair/releases/download/v${ECLAIR_VER}/eclair-node-${ECLAIR_VER}-${ECLAIR_COMMIT}-bin.zip \
 	&& unzip eclair-node-${ECLAIR_VER}-${ECLAIR_COMMIT}-bin.zip \

code/docker/eclair/eclair/eclair.conf

@@ -23,6 +23,11 @@ eclair {
     zmqblock = "tcp://bitcoind:12005"
     zmqtx = "tcp://bitcoind:12006"
   }
-
-  on-chain-fees.max-feerate-mismatch = 100
+  
+  on-chain-fees {
+    feerate-tolerance {
+      ratio-low = 0.000001
+      ratio-high = 1000000
+    }
+  }
 }

code/docker/lnd/Dockerfile

@@ -4,8 +4,10 @@ ENV GOPATH /go
 WORKDIR $GOPATH/src
 
 # LND
+ENV LND_VER v0.11.1-beta
 RUN go get -d github.com/lightningnetwork/lnd
 WORKDIR $GOPATH/src/github.com/lightningnetwork/lnd
+RUN git checkout tags/${LND_VER}
 RUN make && make install
 
 FROM ubuntu:20.04 AS lnd-run