updated to 0.10.4 docker files

.project

@@ -7,6 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>com.googlecode.goclipse.goBuilder</name>
+			<triggers>clean,full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

DOCKER/build.sh

 #!/bin/sh
 
-<<<<<<< HEAD
-release_maj="0.10"
-release_min="0.10.2"
-=======
 if [ "$CIRCLE_BRANCH" ]
 then
   repo=`pwd`
@@ -15,7 +11,6 @@ branch=${CIRCLE_BRANCH:=master}
 
 release_min=$(cat $repo/version/version.go | tail -n 1 | cut -d \  -f 4 | tr -d '"')
 release_maj=$(echo $release_min | cut -d . -f 1-2)
->>>>>>> fix_versions
 
 start=`pwd`
 image_base=quay.io/eris/erisdb
@@ -30,4 +25,4 @@ else
   docker build -t $image_base:$branch -f DOCKER/Dockerfile .
 fi
 
-cd $start
+cd $start
\ No newline at end of file

DOCKER/start.sh

 #! /bin/bash
 
 ifExit(){
-	if [ $? -ne 0 ]; then
+	if [[ $? != 0 ]]; then
 		echo "ifExit"
 		echo "$1"
 		for var in "$@"
@@ -13,7 +13,7 @@ ifExit(){
 }
 
 if0Exit(){
-	if [ $? -e 0 ]; then
+	if [[ $? == 0 ]]; then
 		echo "if0Exit"
 		echo "$1"
 		for var in "$@"
@@ -38,7 +38,7 @@ fi
 
 # TODO: deal with chain numbers
 # and eg. $CONTAINER_NAME
-CHAIN_DIR="/home/$USER/.eris/blockchains/$CHAIN_ID"
+CHAIN_DIR="/home/$USER/.eris/chains/$CHAIN_ID"
 
 # set the tendermint directory
 TMROOT=$CHAIN_DIR
@@ -50,7 +50,7 @@ fi
 
 # our root chain
 if [ ! $ROOT_CHAIN_ID ]; then
-	ROOT_CHAIN_ID=etcb_testnet	
+	ROOT_CHAIN_ID=etcb_testnet
 fi
 if [ ! $NODE_ADDR ]; then
 	NODE_ADDR=interblock.io:46657
@@ -119,7 +119,6 @@ export ECM_PATH  # set by Dockerfile
 export MINTX_NODE_ADDR=$NODE_ADDR
 export MINTX_SIGN_ADDR=keys:4767
 
-
 # print the version
 bash $ECM_PATH/version.sh
 
@@ -134,14 +133,8 @@ case $CMD in
 	;;
 "run" ) $ECM_PATH/chain_run.sh
 	;;
-<<<<<<< HEAD
-"api" ) $ECM_PATH/chain_api.sh
-  ;;
-*)	echo "Enter a command for starting the chain (install, new, run, api)"
-=======
 "register" ) $ECM_PATH/chain_register.sh
 	;;
 *)	echo "Enter a command for starting the chain (new, install, run, register)"
->>>>>>> fix_versions
 	;;
-esac
+esac
\ No newline at end of file

version/version.go

@@ -4,4 +4,4 @@ import (
 
 )
 
-const Version = "0.11.6"
+const Version = "0.12.0"