diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 1d4d05f27139085c8fc83d6ab6a45dbc85b155cf..3d4c53b84b5ece23aa3bb3fe2cc8c02f915822d5 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 06bedab70500bda6596f4dabe0437f80af4d2c4b..6adc42f5e4e2c5fdf105fb06968896ebdb6a9e55 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 a375c1c1e5fbb26e6f593d0fd458edf26ce9a574..116023d3dd6ea58d898098a2d894fd9c15555f2d 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"