SQUASH default to CHAIN_DIR over TMROOT

DOCKER/Dockerfile

@@ -73,7 +73,7 @@ USER $USER
 RUN mkdir --parents /home/$USER/.eris/chains/tendermint
 ENV TMROOT /home/$USER/.eris/chains/tendermint
 
-# run tendermint
+# run eris-db
 # ports: 1337:eris-db API; 46656:tendermint-peer; 46657:tendermint-rpc
 EXPOSE 1337
 EXPOSE 46656

DOCKER/chain_api.sh

 #! /bin/bash
 
 echo "Running chain $CHAIN_ID (via ErisDB API)"
-erisdb $TMROOT
+erisdb $CHAIN_DIR

DOCKER/chain_new.sh

@@ -33,7 +33,7 @@ fi
 # tendermint node & last_pid=$! && sleep 1 && kill -KILL $last_pid
 if [ $ERISDB_API ]; then
 	echo "Running chain $CHAIN_ID (via ErisDB API)"
-	erisdb $TMROOT
+	erisdb $CHAIN_DIR
 	ifExit "Error starting erisdb"
 else
 	echo Running chain $CHAIN_ID

DOCKER/chain_run.sh

@@ -2,7 +2,7 @@
 
 if [ $ERISDB_API ]; then
 	echo "Running chain $CHAIN_ID (via ErisDB API)"
-	erisdb $TMROOT
+	erisdb $CHAIN_DIR
 	ifExit "Error starting erisdb"
 else
 	echo Running chain $CHAIN_ID

DOCKER/start.sh

@@ -41,7 +41,7 @@ fi
 CHAIN_DIR="/home/$USER/.eris/chains/$CHAIN_ID"
 
 # set the tendermint directory
-TMROOT=$CHAIN_DIR
+TMROOT="$CHAIN_DIR"/tendermint
 
 if [ ! -d "$CHAIN_DIR" ]; then
 	mkdir -p $CHAIN_DIR

net_test/data/init.sh

@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file

net_test/data/net_test_0/init.sh

@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file

net_test/data/net_test_1/init.sh

@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file

net_test/data/net_test_2/init.sh

@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file

net_test/data/net_test_3/init.sh

@@ -9,4 +9,4 @@ git fetch origin $BRANCH
 git checkout $BRANCH
 go install ./cmd/erisdb
 
-erisdb $TMROOT # should be exposed by docker file
+erisdb $CHAIN_DIR # should be exposed by docker file