From c777e01a5444b705008ab894cd511e6a65e9274e Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 31 Aug 2015 14:56:51 +0000
Subject: [PATCH] some docker fixes

---
 DOCKER/Dockerfile   | 9 +++++++--
 DOCKER/chain_new.sh | 2 +-
 DOCKER/version.sh   | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile
index 1d4d05f2..3d4c53b8 100644
--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -14,7 +14,8 @@ RUN apt-get update && \
 
 # set the repo and install tendermint -- should track vendored commit
 ENV REPO github.com/tendermint/tendermint
-ENV COMMIT 4ee387d0770ed379e2d524f7077938517b38cd7c
+#ENV COMMIT 4ee387d0770ed379e2d524f7077938517b38cd7c
+ENV COMMIT json_time
 # note, we want to lock in the same commit number
 #  as eris-db has vendored.
 RUN mkdir --parents $GOPATH/src/$REPO
@@ -38,7 +39,7 @@ RUN cd ./cmd/erisdb && go build -o /usr/local/bin/erisdb && \
 
 # set the repo and install mint-client
 ENV REPO github.com/eris-ltd/mint-client
-ENV BRANCH master
+ENV BRANCH develop
 RUN mkdir --parents $GOPATH/src/$REPO
 WORKDIR $GOPATH/src/$REPO
 RUN git clone --quiet https://$REPO . && \
@@ -69,6 +70,10 @@ RUN mkdir -p $ECM_PATH
 COPY DOCKER/chain_* $ECM_PATH/
 COPY DOCKER/config.toml $ECM_PATH/
 COPY DOCKER/version.sh $ECM_PATH/
+
+#-----------------------------------------------------------------------------
+# permission the directories
+RUN chown -R eris /usr/local/bin
 RUN chown -R eris $ECM_PATH
 
 #-----------------------------------------------------------------------------
diff --git a/DOCKER/chain_new.sh b/DOCKER/chain_new.sh
index 06bedab7..6adc42f5 100755
--- a/DOCKER/chain_new.sh
+++ b/DOCKER/chain_new.sh
@@ -2,7 +2,7 @@
 
 echo "your new chain, kind marmot: $CHAIN_ID"
 
-if [ "$GENERATE_GENESIS" = "true" ]; then
+if [ ! -f $CHAIN_DIR/genesis.json ]; then
 	if [ "$CSV" = "" ]; then
 		mintgen random --dir="$CHAIN_DIR" 1 $CHAIN_ID
 		ifExit "Error creating random genesis file"
diff --git a/DOCKER/version.sh b/DOCKER/version.sh
index a375c1c1..116023d3 100644
--- a/DOCKER/version.sh
+++ b/DOCKER/version.sh
@@ -1 +1,2 @@
-echo "ecm version 0.0.2"
+# json break
+echo "ecm version 0.0.3"
-- 
GitLab