From 74e4fc9fbf83b852731743716fda934a3de89c9e Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Thu, 11 Oct 2018 16:02:15 -0400
Subject: [PATCH] Fixed cln directory and some permission issues

---
 docker-compose.yml               | 7 ++++---
 proxy_docker/Dockerfile          | 1 +
 proxy_docker/app/script/trace.sh | 4 ++--
 proxy_docker/env.properties      | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ecb9dd0..54ae02f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,11 +12,12 @@ services:
       # Variable substitutions don't work
       # Match with DB_PATH in proxy_docker/env.properties
       - "~/btcproxydb:/proxy/db"
-      - "~/lndata:/proxy/.lightning"
+      # c-lightning looks for $HOME/.lightning/, and $HOME is set to / in the container
+      - "~/lndata:/.lightning"
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]
-    command: $USER /proxy/startproxy.sh
+    command: $USER ./startproxy.sh
     networks:
       - cyphernodenet
 
@@ -41,7 +42,7 @@ services:
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]
-    command: $USER /pycoin/startpycoin.sh
+    command: $USER ./startpycoin.sh
     networks:
       - cyphernodenet
 
diff --git a/proxy_docker/Dockerfile b/proxy_docker/Dockerfile
index bfb06e5..8baa72d 100644
--- a/proxy_docker/Dockerfile
+++ b/proxy_docker/Dockerfile
@@ -38,6 +38,7 @@ COPY app/bin/lightning-cli_x86 ${HOME}/lightning-cli
 WORKDIR ${HOME}
 
 RUN chmod +x startproxy.sh requesthandler.sh lightning-cli \
+ && chmod o+w . \
  && mkdir db
 
 VOLUME ["${HOME}/db", "${HOME}/.lightning"]
diff --git a/proxy_docker/app/script/trace.sh b/proxy_docker/app/script/trace.sh
index 9ff1b50..680f3f2 100644
--- a/proxy_docker/app/script/trace.sh
+++ b/proxy_docker/app/script/trace.sh
@@ -3,13 +3,13 @@
 trace()
 {
 	if [ -n "${TRACING}" ]; then
-		echo "$(date -Is) ${1}" > /dev/stderr
+		echo "$(date -Is) ${1}" 1>&2
 	fi
 }
 
 trace_rc()
 {
 	if [ -n "${TRACING}" ]; then
-		echo "$(date -Is) Last return code: ${1}" > /dev/stderr
+		echo "$(date -Is) Last return code: ${1}" 1>&2
 	fi
 }
diff --git a/proxy_docker/env.properties b/proxy_docker/env.properties
index fb69418..da95f88 100644
--- a/proxy_docker/env.properties
+++ b/proxy_docker/env.properties
@@ -3,6 +3,7 @@ WATCHER_BTC_NODE_RPC_URL=btcnode:18332/wallet/watching01.dat
 SPENDER_BTC_NODE_RPC_URL=btcnode:18332/wallet/spending01.dat
 PROXY_LISTENING_PORT=8888
 # Variable substitutions don't work
+HOME=/proxy
 DB_PATH=/proxy/db
 DB_FILE=/proxy/db/proxydb
 # Pycoin container