From f53009be3549aa0436fa57a46cc92dd80344be9f Mon Sep 17 00:00:00 2001
From: SKP <jash@schulterklopfer-productions.de>
Date: Wed, 3 Jul 2019 21:08:52 +0200
Subject: [PATCH] Run can now either run inside docker or directly.

---
 cyphernodeconf_docker/run.sh | 68 ++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/cyphernodeconf_docker/run.sh b/cyphernodeconf_docker/run.sh
index bbbdf39..b3e669d 100755
--- a/cyphernodeconf_docker/run.sh
+++ b/cyphernodeconf_docker/run.sh
@@ -1,35 +1,43 @@
 #!/bin/sh
 
-SETUP_DIR=$(pwd)/../dist
-DEFAULT_CERT_HOSTNAME=disk0book.local
-PROXYCRON_VERSION=v0.2.1-rc.1
-PYCOIN_VERSION=v0.2.1-rc.1
-SETUP_VERSION=v0.2.1-rc.1
-BITCOIN_VERSION=v0.17.1
-LIGHTNING_VERSION=v0.7.0
-DEFAULT_DATADIR_BASE=$HOME
-GATEKEEPER_VERSION=v0.2.1-rc.1
-PROXY_VERSION=v0.2.1-rc.1
-OTSCLIENT_VERSION=v0.2.1-rc.1
-NOTIFIER_VERSION=v0.2.1-rc.1
-EDITOR=/usr/bin/nano
+export SETUP_DIR=$(pwd)/../dist
+export DEFAULT_USER=$USER
+export DEFAULT_CERT_HOSTNAME=disk0book.local
+export PROXYCRON_VERSION=v0.2.1-rc.1
+export PYCOIN_VERSION=v0.2.1-rc.1
+export SETUP_VERSION=v0.2.1-rc.1
+export BITCOIN_VERSION=v0.17.1
+export LIGHTNING_VERSION=v0.7.0
+export DEFAULT_DATADIR_BASE=$HOME
+export GATEKEEPER_VERSION=v0.2.1-rc.1
+export PROXY_VERSION=v0.2.1-rc.1
+export OTSCLIENT_VERSION=v0.2.1-rc.1
+export NOTIFIER_VERSION=v0.2.1-rc.1
+export EDITOR=/usr/bin/nano
 
 user=$(id -u):$(id -g)
 
-docker run -v $(pwd)/testinst:/data \
-             -e DEFAULT_USER=jash \
-             -e DEFAULT_DATADIR_BASE=$HOME \
-             -e SETUP_DIR=$SETUP_DIR \
-             -e DEFAULT_CERT_HOSTNAME=$(hostname) \
-             -e GATEKEEPER_VERSION=$GATEKEEPER_VERSION \
-             -e PROXY_VERSION=$PROXY_VERSION \
-             -e NOTIFIER_VERSION=$NOTIFIER_VERSION \
-             -e PROXYCRON_VERSION=$PROXYCRON_VERSION \
-             -e OTSCLIENT_VERSION=$OTSCLIENT_VERSION \
-             -e PYCOIN_VERSION=$PYCOIN_VERSION \
-             -e BITCOIN_VERSION=$BITCOIN_VERSION \
-             -e LIGHTNING_VERSION=$LIGHTNING_VERSION \
-             -e SETUP_VERSION=$SETUP_VERSION \
-             --log-driver=none \
-             --network none \
-             --rm -it cyphernode/cyphernodeconf:v0.2.0-local $user node index.js $@
+if [ "${MODE}" = 'docker' ]; then
+  docker build . -t cyphernodeconf:local
+  docker run -v $(pwd)/testinst:/data \
+           -e DEFAULT_USER=jash \
+           -e DEFAULT_DATADIR_BASE=$HOME \
+           -e SETUP_DIR=$SETUP_DIR \
+           -e DEFAULT_CERT_HOSTNAME=$(hostname) \
+           -e GATEKEEPER_VERSION=$GATEKEEPER_VERSION \
+           -e PROXY_VERSION=$PROXY_VERSION \
+           -e NOTIFIER_VERSION=$NOTIFIER_VERSION \
+           -e PROXYCRON_VERSION=$PROXYCRON_VERSION \
+           -e OTSCLIENT_VERSION=$OTSCLIENT_VERSION \
+           -e PYCOIN_VERSION=$PYCOIN_VERSION \
+           -e BITCOIN_VERSION=$BITCOIN_VERSION \
+           -e LIGHTNING_VERSION=$LIGHTNING_VERSION \
+           -e SETUP_VERSION=$SETUP_VERSION \
+           -e DEFAULT_USER=$DEFAULT_USER \
+           --log-driver=none \
+           --network none \
+           --rm -it cyphernodeconf:local $user node index.js $@
+else
+  /usr/local/bin/node index.js $@
+fi
+