Merge pull request #1106 from hyperledger/develop

develop -> master for 0.25.1

Author: Sean Young

.circleci/Dockerfile

@@ -31,4 +31,6 @@ RUN curl -L https://github.com/goreleaser/goreleaser/releases/download/$GORELEAS
 RUN npm install -g mocha
 RUN npm install -g mocha-circleci-reporter
 ENV CI=true
+# Protobuf builds require being in GOPATH (more or less) but this disables module support by default
+ENV GO111MODULE=on
 WORKDIR /go/src/github.com/hyperledger/burrow

.circleci/config.yml

@@ -35,12 +35,6 @@ jobs:
       - checkout
       - run: docker-compose run burrow make test_integration_no_postgres
 
-  ensure_vendor:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: make ensure_vendor
-
   build_docker:
     <<: *defaults
     steps:
@@ -81,10 +75,6 @@ workflows:
           filters:
             <<: *tags_filters
 
-      - ensure_vendor:
-          filters:
-            <<: *tags_filters
-
       - build_docker:
           filters:
             # tags filters and branch filters are applied disjunctively, so we

CHANGELOG.md

@@ -1,7 +1,15 @@
 # [Hyperledger Burrow](https://github.com/hyperledger/burrow) Changelog
-## [Unreleased]
-### Added
-- [CLI] Introduced burrow configure --pool for generation of multiple validator configs suitable for running on a single (or many) machines
+## [0.25.1] - 2019-05-03
+### Changed
+- [Config] Split ListenAddress into ListenHost and ListenPort to ease parsing in the Helm charts
+- [CLI] Burrow restore now always fails if state is detected but can be made --silent
+- [CLI] No dump client timeout by default
+- [Deploy] Reduced the default logging level to trace instead of info
+- [Build] Switched to Go modules
+
+### Fixed
+- [Keys] Resolved an issue where the keyStore wasn't built when using the remote keys client.
+- [Deploy] Fix nil dereference in query error path, check constructor args in BuildJob
 
 
 ## [0.25.0] - 2019-04-05
@@ -12,6 +20,7 @@
 - [Kernel] Refactored and various exported methods changed
 
 ### Added
+- [CLI] Introduced burrow configure --pool for generation of multiple validator configs suitable for running on a single (or many) machines
 - [CLI] Burrow deploy can now run multiple burrow deploy files (aka playbooks) and run them in parallel
 - [Consensus] Now possible to run Burrow without Tendermint in 'NoConsensus' mode by setting Tendermint.Enabled = false  for faster local testing. Execution.TimeoutFactor can be used to control how regularly Burrow commits (and is used 
 
@@ -458,7 +467,7 @@ This release marks the start of Eris-DB as the full permissioned blockchain node
   - [Blockchain] Fix getBlocks to respect block height cap.
 
 
-[Unreleased]: https://github.com/hyperledger/burrow/compare/v0.25.0...HEAD
+[0.25.1]: https://github.com/hyperledger/burrow/compare/v0.25.0...v0.25.1
 [0.25.0]: https://github.com/hyperledger/burrow/compare/v0.24.6...v0.25.0
 [0.24.6]: https://github.com/hyperledger/burrow/compare/v0.24.5...v0.24.6
 [0.24.5]: https://github.com/hyperledger/burrow/compare/v0.24.4...v0.24.5

Dockerfile

@@ -1,19 +1,19 @@
 # For solc binary
 FROM ethereum/solc:0.4.25 as solc-builder
 # We use a multistage build to avoid bloating our deployment image with build dependencies
-FROM golang:1.11.5-alpine3.8 as builder
+FROM golang:1.12.0-alpine3.9 as builder
 
 RUN apk add --no-cache --update git bash make
 
-ARG REPO=$GOPATH/src/github.com/hyperledger/burrow
+ARG REPO=/src/burrow
 COPY . $REPO
 WORKDIR $REPO
 
 # Build purely static binaries
 RUN make build
 
 # This will be our base container image
-FROM alpine:3.8
+FROM alpine:3.9
 
 # Variable arguments to populate labels
 ARG USER=burrow
@@ -33,7 +33,7 @@ RUN addgroup -g 101 -S $USER && adduser -S -D -u 1000 $USER $USER
 WORKDIR $BURROW_PATH
 
 # Copy binaries built in previous stage
-COPY --from=builder /go/src/github.com/hyperledger/burrow/bin/burrow $INSTALL_BASE/
+COPY --from=builder /src/burrow/bin/burrow $INSTALL_BASE/
 COPY --from=solc-builder /usr/bin/solc $INSTALL_BASE/
 
 # Expose ports for 26656:peer; 26658:info; 10997:grpc