diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 00922f33f1ce6b9d87883718fde3d00da65fa045..1ea0ba0f1d5c321d47e53b73df1aacbb71e1359d 100644 --- a/DOCKER/Dockerfile +++ b/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 diff --git a/circle.yml~ b/circle.yml~ deleted file mode 100644 index 268e14477dd4ab374a63facb52bef8ff47040daf..0000000000000000000000000000000000000000 --- a/circle.yml~ +++ /dev/null @@ -1,30 +0,0 @@ -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 diff --git a/version/version.go b/version/version.go index ed42d7045d61d567772c6bc9febc7869a14a1509..e8308f53bd79ad1899057d9f190eb7fc0fd6210d 100644 --- a/version/version.go +++ b/version/version.go @@ -1,7 +1,3 @@ package version -import ( - -) - -const Version = "0.11.0" +const Version = "0.11.1"