Merge pull request #28 from eris-ltd/chains-new-fix

update chains new sequence

DOCKER/Dockerfile

@@ -4,15 +4,6 @@ MAINTAINER Eris Industries <support@erisindustries.com>
 
 #-----------------------------------------------------------------------------
 # dependencies
-
-# Set the env variables to non-interactive
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBIAN_PRIORITY critical
-ENV DEBCONF_NOWARNINGS yes
-ENV TERM linux
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-# grab deps (gmp)
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
     libgmp3-dev && \
@@ -29,7 +20,7 @@ COPY DOCKER/start.sh /usr/local/bin/erisdb-wrapper
 
 # set the repo and install tendermint
 ENV REPO github.com/tendermint/tendermint
-ENV BRANCH f2f437a328cb3e277bc4ac74e4a1180f1c28efbc
+ENV BRANCH 4ee387d0770ed379e2d524f7077938517b38cd7c
 # note, we want to lock in the same commit number
 #  as eris-db has vendored.
 RUN mkdir --parents $GOPATH/src/$REPO
@@ -74,8 +65,8 @@ RUN rm -rf $GOPATH/src/* && \
 
 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/chain_* $ECM_PATH
+COPY DOCKER/config.toml $ECM_PATH
 
 #-----------------------------------------------------------------------------
 # root dir

DOCKER/build.sh

 #!/bin/sh
+
 base=github.com/eris-ltd/eris-db
 release="0.10"
 repo=$GOPATH/src/$base

DOCKER/chain_new.sh

@@ -3,12 +3,12 @@
 echo "new chain: $CHAIN_ID"
 
 if [ "$GENERATE_GENESIS" = "true" ]; then
-	mintgen --single $CHAIN_DIR
+	mintgen random --dir="/home/eris/.eris/blockchains/$CHAIN_ID" 1 $CHAIN_ID
 	ifExit "Error creating genesis file"
 fi
 
 if [ "$RUN" = "true" ]; then
-	tendermint node	
+	tendermint node
 	ifExit "Error starting tendermint"
 else
 	# this will just run for a second and quit

circle.yml~

-machine:
-  post:
-    - rm -rf ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
-    - mkdir -p ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}
-    - cp -r ${HOME}/${CIRCLE_PROJECT_REPONAME} ${GOPATH%%:*}/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
-    - git config --global user.email "billings@erisindustries.com"
-    - git config --global user.name "Billings the Bot"
-
-dependencies:
-  pre:
-    - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.6.0-circleci'; chmod 0755 /usr/bin/docker; true
-    - sudo service docker start
-    - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-    - "sudo apt-get update && sudo apt-get install -y libgmp3-dev"
-
-  override:
-    - "cd ./cmd/erisdb && go get -d && go build"
-    - "mv ~/eris-db/cmd/erisdb/erisdb ~/bin"
-    - chmod +x ~/bin/erisdb
-
-test:
-  override:
-    - go test -v ./...
-
-deployment:
-  master:
-    branch: master
-    commands:
-      - "export ERISDB_BUILD_BRANCH=$CIRCLE_BRANCH && DOCKER/build.sh"
-      - docker push eris/erisdb:latest
-      - docker push eris/erisdb:0.10
-  unstable:
-    branch: develop
-    commands:
-      - "export ERISDB_BUILD_BRANCH=$CIRCLE_BRANCH && DOCKER/build.sh"
-      - docker tag eris/erisdb:$CIRCLE_BRANCH eris/db:unstable
-      - docker push eris/erisdb:unstable