From 236cdd947f050b7a22d7dea880d1593c0adfe306 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 24 Aug 2015 18:30:24 +0000
Subject: [PATCH] add ecm version, fix config

---
 DOCKER/Dockerfile   | 1 +
 DOCKER/chain_new.sh | 9 ++++++++-
 DOCKER/start.sh     | 3 +++
 DOCKER/version.sh   | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 DOCKER/version.sh

diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index 62467f4c..661c0577 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -67,6 +67,7 @@ ENV ECM_PATH /usr/local/lib/ecm/
 RUN mkdir -p $ECM_PATH
 COPY DOCKER/chain_* $ECM_PATH
 COPY DOCKER/config.toml $ECM_PATH
+COPY DOCKER/version.sh $ECM_PATH
 RUN chown -R eris $ECM_PATH
 
 
diff --git a/DOCKER/chain_new.sh b/DOCKER/chain_new.sh
index 7761ceee..ba21008e 100755
--- a/DOCKER/chain_new.sh
+++ b/DOCKER/chain_new.sh
@@ -16,7 +16,14 @@ else
 	cp genesis.json $CHAIN_DIR/genesis.json
 fi
 
-mintconfig $CONFIG_OPTS > $CHAIN_DIR/config.toml
+# if no config was given, lay one with the given options
+if [ ! -f $CHAIN_DIR/config.toml ]; then
+	echo "running mintconfig $CONFIG_OPTS"
+	mintconfig $CONFIG_OPTS > $CHAIN_DIR/config.toml
+else
+	echo "found config file:"
+	cat $CHAIN_DIR/config.toml
+fi
 
 if [ "$RUN" = "true" ]; then
 	tendermint node
diff --git a/DOCKER/start.sh b/DOCKER/start.sh
index dba42aab..2db7481e 100755
--- a/DOCKER/start.sh
+++ b/DOCKER/start.sh
@@ -51,6 +51,9 @@ export NODE_HOST
 export ECM_PATH  # set by Dockerfile
 
 
+# print the version
+bash $ECM_PATH/version.sh
+
 #-----------------------------------------------------------------------
 # either we are fetching a chain for the first time,
 # creating one from scratch, or running one we already have
diff --git a/DOCKER/version.sh b/DOCKER/version.sh
new file mode 100644
index 00000000..a375c1c1
--- /dev/null
+++ b/DOCKER/version.sh
@@ -0,0 +1 @@
+echo "ecm version 0.0.2"
-- 
GitLab