Merge pull request #50 from eris-ltd/dockerFileFix

fixes to dockerfile so itll now build

DOCKER/Dockerfile

@@ -25,22 +25,12 @@ RUN git clone --quiet https://$REPO . && \
   git checkout --quiet $COMMIT && \
   go build -o /usr/local/bin/tendermint ./cmd/tendermint
 
-#-----------------------------------------------------------------------------
-# install erisdb
-
-# set the repo and install erisdb
-ENV REPO $GOPATH/src/github.com/eris-ltd/eris-db
-COPY . $REPO
-WORKDIR $REPO
-RUN cd ./cmd/erisdb && go build -o /usr/local/bin/erisdb && \
-  cd ../erisdbss && go build -o /usr/local/bin/erisdbss && cd ../..
-
 #-----------------------------------------------------------------------------
 # install mint-client tools
 
 # set the repo and install mint-client
 ENV REPO github.com/eris-ltd/mint-client
-ENV BRANCH develop
+ENV BRANCH master
 RUN mkdir --parents $GOPATH/src/$REPO
 WORKDIR $GOPATH/src/$REPO
 RUN git clone --quiet https://$REPO . && \
@@ -49,11 +39,21 @@ RUN git clone --quiet https://$REPO . && \
   mv $GOPATH/bin/mint* /usr/local/bin && \
   mv ./mint-client /usr/local/bin/
 
+#-----------------------------------------------------------------------------
+# install erisdb
+
+# set the repo and install erisdb
+ENV REPO $GOPATH/src/github.com/eris-ltd/eris-db
+COPY . $REPO
+WORKDIR $REPO
+RUN cd ./cmd/erisdb && go build -o /usr/local/bin/erisdb && cd ../..
+
 #-----------------------------------------------------------------------------
 # cleanup
 
 RUN rm -rf $GOPATH/src/* && \
   unset REPO && \
+  unset REPO_ALIAS && \
   unset COMMIT && \
   unset BRANCH
 

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.8.2-circleci'; chmod 0755 /usr/bin/docker; true
-    - sudo service docker start
-    - "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:
-      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
-      - DOCKER/build.sh
-      - docker push quay.io/eris/erisdb