From eeb96fa7ccb3a01bb02657d84a2f5ea9c181ecc3 Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Fri, 12 Oct 2018 22:22:33 +0200
Subject: [PATCH] support for su-exec containers

---
 .../installer/docker/docker-compose.yaml       | 18 +++++++++++-------
 install/script/install_docker.sh               |  8 ++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
index 7a17c36..3cccc57 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
+++ b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
@@ -2,6 +2,7 @@ version: "3"
 
 services:
   proxy:
+    command: $USER ./startproxy.sh
     # Bitcoin Mini Proxy
     environment:
       - "TRACING=1"
@@ -10,10 +11,10 @@ services:
       - "WATCHER_BTC_NODE_RPC_CFG=/tmp/watcher_btcnode_curlcfg.properties"
       - "SPENDER_BTC_NODE_RPC_URL=<%= (bitcoin_mode === 'internal')?'bitcoin':bitcoin_node_ip %>:<%= (net === 'mainnet')?'8332':'18332' %>/wallet/spending01.dat"
       - "SPENDER_BTC_NODE_RPC_USER=<%= bitcoin_rpcuser %>:<%= bitcoin_rpcpassword %>"
-      - "SPENDER_BTC_NODE_RPC_CFG=/tmp/sender_btcnode_curlcfg.properties"
+      - "SPENDER_BTC_NODE_RPC_CFG=/tmp/spender_btcnode_curlcfg.properties"
       - "PROXY_LISTENING_PORT=8888"
-      - "DB_PATH=/app/db"
-      - "DB_FILE=/app/db/proxydb"
+      - "DB_PATH=/proxy/db"
+      - "DB_FILE=/proxy/db/proxydb"
       - "PYCOIN_CONTAINER=pycoin:7777"
       - "OTS_CONTAINER=otsclient:6666"
       - "DERIVATION_PUB32=<%= xpub %>"
@@ -25,8 +26,8 @@ services:
       - "8888:8888"
 <% } %>
     volumes:
-      - "<%= proxy_datapath %>:/app/db"
-      - "<%= lightning_datapath %>:/app/.lightning"
+      - "<%= proxy_datapath %>:/proxy/db"
+      - "<%= lightning_datapath %>:/proxy/.lightning"
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]
@@ -45,6 +46,7 @@ services:
     restart: always
   pycoin:
     # Pycoin
+    command: $USER ./startpycoin.sh
     image: cyphernode/pycoin
     environment:
       - "TRACING=1"
@@ -61,11 +63,12 @@ services:
     restart: always
 <% if ( features.indexOf('lightning') !== -1 && lightning_implementation === 'c-lightning' ) { %>
   lightning:
+    command: $USER lightningd
     image: cyphernode/clightning
     ports:
       - "9735:9735"
     volumes:
-      - "<%= lightning_datapath%>:/lnuser/.lightning"
+      - "<%= lightning_datapath%>:/.lightning"
 #    deploy:
 #      placement:
 #        constraints: [node.hostname==dev]
@@ -75,13 +78,14 @@ services:
 <% } %>
 <% if( bitcoin_mode === 'internal' ) { %>
   bitcoin:
+    command: $USER bitcoind
     image: cyphernode/bitcoin
 <% if( bitcoin_expose ) { %>
     ports:
       - "<%= (net === 'mainnet')?'8332:8332':'18332:18332' %>"
 <% } %>
     volumes:
-      - "<%= bitcoin_datapath%>:/bitcoinuser/.bitcoin"
+      - "<%= bitcoin_datapath%>:/.bitcoin"
     networks:
       - cyphernodenet
     restart: always
diff --git a/install/script/install_docker.sh b/install/script/install_docker.sh
index d420519..cb5dc8b 100644
--- a/install/script/install_docker.sh
+++ b/install/script/install_docker.sh
@@ -85,9 +85,9 @@ install_docker() {
   trace "Copying docker-compose.yaml to top level"
   cp $sourceDataPath/installer/docker/docker-compose.yaml $topLevel/docker-compose.yaml
 
-  echo "+------------------------------------------+"
-  echo "|        to start cyphernode run:          |"
-  echo "| docker-compose -f docker-compose.yaml up |"
-  echo "+------------------------------------------+"
+  echo "+---------------------------------------------------------------+"
+  echo "|                     to start cyphernode run:                  |"
+  echo '| USER=`id -u`:`id -g` docker-compose -f docker-compose.yaml up |'
+  echo "+---------------------------------------------------------------+"
 
 }
\ No newline at end of file