From 17f27ab90fc05ba562e472a16d656f1ed64b530b Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Wed, 28 Feb 2018 14:49:18 -0700 Subject: [PATCH] Prepare for release v1.0.6 -Update Dockerfile Go version to 1.9.4 -Add ARM32v6 build of Docker image --- .travis.yml | 2 +- Dockerfile | 4 ++-- Dockerfile.all | 5 +++-- README.md | 31 +++++++++++++++++-------------- server/const.go | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60048803..603c1ca3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ script: - go test -i -race $EXCLUDE_VENDOR - if [[ "$TRAVIS_GO_VERSION" == 1.9.* ]]; then ./scripts/cov.sh TRAVIS; else go test -v -race $EXCLUDE_VENDOR; fi after_success: -- if [[ "$TRAVIS_GO_VERSION" == 1.9.* ]] && [ "$TRAVIS_TAG" != "" ]; then ghr --owner nats-io --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi +- if [[ "$TRAVIS_GO_VERSION" == 1.9.* ]] && [ "$TRAVIS_TAG" != "" ]; then ghr --owner nats-io --token $GITHUB_NEW_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi diff --git a/Dockerfile b/Dockerfile index 82856aff..055e9283 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM golang:1.9.2 +FROM golang:1.9.4 -MAINTAINER Derek Collison +MAINTAINER Ivan Kozlovic COPY . /go/src/github.com/nats-io/gnatsd WORKDIR /go/src/github.com/nats-io/gnatsd diff --git a/Dockerfile.all b/Dockerfile.all index eb8503a9..4fd617d2 100644 --- a/Dockerfile.all +++ b/Dockerfile.all @@ -1,11 +1,12 @@ -FROM golang:1.9.2 +FROM golang:1.9.4 -MAINTAINER Ivan Kozlovic +MAINTAINER Ivan Kozlovic COPY . /go/src/github.com/nats-io/gnatsd WORKDIR /go/src/github.com/nats-io/gnatsd RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-amd64/gnatsd +RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-arm6/gnatsd RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-arm7/gnatsd RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-arm64/gnatsd RUN CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/win-amd64/gnatsd.exe diff --git a/README.md b/README.md index 304bd862..caa5fb72 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,10 @@ To start the NATS server with default settings (and no authentication or cluster ```sh > ./gnatsd -[71829] 2017/09/22 14:57:27.740599 [INF] Starting nats-server version 1.0.4 -[71829] 2017/09/22 14:57:27.740735 [INF] Listening for client connections on 0.0.0.0:4222 -[71829] 2017/09/22 14:57:27.740739 [INF] Server is ready +[1764] 2018/02/28 14:29:45.033940 [INF] Starting nats-server version 1.0.6 +[1764] 2018/02/28 14:29:45.034017 [INF] Git commit [not set] +[1764] 2018/02/28 14:29:45.034255 [INF] Listening for client connections on 0.0.0.0:4222 +[1764] 2018/02/28 14:29:45.034262 [INF] Server is ready ``` The server is started and listening for client connections on port 4222 (the default) from all available interfaces. The logs are displayed to stdout as shown above in the server output. @@ -69,7 +70,7 @@ The NATS server uses a [text based protocol](http://nats.io/documentation/intern Trying 107.170.221.32... Connected to demo.nats.io. Escape character is '^]'. -INFO {"server_id":"kG19DsXX1UVeSyEjhl3RFw","version":"1.0.4","go":"go1.8.3","host":"0.0.0.0","port":4222, ...} +INFO {"server_id":"mxyLRV3o96bPBziXld35wt","version":"1.0.6","go":"go1.8.4","host":"0.0.0.0","port":4222, ...} SUB foo 1 +OK PUB foo 11 @@ -677,10 +678,11 @@ Examples using the test certificates which are self signed for localhost and 127 ```bash > ./gnatsd --tls --tlscert=./test/configs/certs/server-cert.pem --tlskey=./test/configs/certs/server-key.pem -[71505] 2017/09/22 14:53:19.769151 [INF] Starting nats-server version 1.0.4 -[71505] 2017/09/22 14:53:19.769315 [INF] Listening for client connections on 0.0.0.0:4222 -[71505] 2017/09/22 14:53:19.769319 [INF] TLS required for client connections -[71505] 2017/09/22 14:53:19.769321 [INF] Server is ready +[1844] 2018/02/28 14:31:47.339201 [INF] Starting nats-server version 1.0.6 +[1844] 2018/02/28 14:31:47.339262 [INF] Git commit [not set] +[1844] 2018/02/28 14:31:47.339410 [INF] Listening for client connections on 0.0.0.0:4222 +[1844] 2018/02/28 14:31:47.339415 [INF] TLS required for client connections +[1844] 2018/02/28 14:31:47.339418 [INF] Server is ready ``` Notice that the log indicates that the client connections will be required to use TLS. If you run the server in Debug mode with `-D` or `-DV`, the logs will show the cipher suite selection for each connected client. @@ -739,10 +741,11 @@ To enable monitoring via the configuration file, use `host:port` (there is no ex For example, running the `gnatsd -m 8222` command, you should see that the NATS server starts with the HTTP monitoring port enabled. To view the monitoring home page, go to http://localhost:8222/. ``` -[71859] 2017/09/22 14:57:45.206152 [INF] Starting nats-server version 1.0.4 -[71859] 2017/09/22 14:57:45.206292 [INF] Starting http monitor on 0.0.0.0:8222 -[71859] 2017/09/22 14:57:45.206328 [INF] Listening for client connections on 0.0.0.0:4222 -[71859] 2017/09/22 14:57:45.206330 [INF] Server is ready +[2220] 2018/02/28 14:35:01.566622 [INF] Starting nats-server version 1.0.6 +[2220] 2018/02/28 14:35:01.566692 [INF] Git commit [not set] +[2220] 2018/02/28 14:35:01.566878 [INF] Starting http monitor on 0.0.0.0:8222 +[2220] 2018/02/28 14:35:01.567188 [INF] Listening for client connections on 0.0.0.0:4222 +[2220] 2018/02/28 14:35:01.567195 [INF] Server is ready ``` ## Development @@ -809,8 +812,8 @@ IN THE SOFTWARE. [License-Image]: https://img.shields.io/badge/License-MIT-blue.svg [Build-Status-Url]: http://travis-ci.org/nats-io/gnatsd [Build-Status-Image]: https://travis-ci.org/nats-io/gnatsd.svg?branch=master -[Release-Url]: https://github.com/nats-io/gnatsd/releases/tag/v1.0.4 -[Release-image]: http://img.shields.io/badge/release-v1.0.4-1eb0fc.svg +[Release-Url]: https://github.com/nats-io/gnatsd/releases/tag/v1.0.6 +[Release-image]: http://img.shields.io/badge/release-v1.0.6-1eb0fc.svg [Coverage-Url]: https://coveralls.io/r/nats-io/gnatsd?branch=master [Coverage-image]: https://coveralls.io/repos/github/nats-io/gnatsd/badge.svg?branch=master [ReportCard-Url]: http://goreportcard.com/report/nats-io/gnatsd diff --git a/server/const.go b/server/const.go index 71c9315d..60f6dd5b 100644 --- a/server/const.go +++ b/server/const.go @@ -24,7 +24,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "1.0.4" + VERSION = "1.0.6" // DEFAULT_PORT is the default port for client connections. DEFAULT_PORT = 4222