From a19dcbee2ded15020ff5efa20db17a6def209b01 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Tue, 31 Mar 2020 10:11:49 -0600 Subject: [PATCH] Release v2.1.6 Signed-off-by: Ivan Kozlovic --- README.md | 4 ++-- docker/Dockerfile.alpine | 4 ++-- server/const.go | 2 +- test/cluster_tls_test.go | 8 ++++---- test/new_routes_test.go | 5 +++++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 06eb7fb7214..374da37b2bd 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ If you are interested in contributing to NATS, read about our... [Fossa-Image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnats-io%2Fgnatsd.svg?type=shield [Build-Status-Url]: https://travis-ci.org/nats-io/nats-server [Build-Status-Image]: https://travis-ci.org/nats-io/nats-server.svg?branch=master -[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.1.4 -[Release-image]: https://img.shields.io/badge/release-v2.1.4-1eb0fc.svg +[Release-Url]: https://github.com/nats-io/nats-server/releases/tag/v2.1.6 +[Release-image]: https://img.shields.io/badge/release-v2.1.6-1eb0fc.svg [Coverage-Url]: https://coveralls.io/r/nats-io/nats-server?branch=master [Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-server/badge.svg?branch=master [ReportCard-Url]: https://goreportcard.com/report/nats-io/nats-server diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 660c1e0298d..4622c4e407f 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM golang:1.13.7-alpine3.11 AS builder +FROM golang:1.13.9-alpine3.11 AS builder WORKDIR $GOPATH/src/github.com/nats-io/nats-server @@ -10,7 +10,7 @@ COPY . . RUN CGO_ENABLED=0 GO111MODULE=off go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-server/server.gitCommit=`git rev-parse --short HEAD`" -o /nats-server -FROM alpine:3.10 +FROM alpine:3.11 RUN apk add --update ca-certificates && mkdir -p /nats/bin && mkdir /nats/conf diff --git a/server/const.go b/server/const.go index 1681f1d7640..1daa93577c1 100644 --- a/server/const.go +++ b/server/const.go @@ -40,7 +40,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "2.1.4" + VERSION = "2.1.6" // PROTO is the currently supported protocol. // 0 was the original diff --git a/test/cluster_tls_test.go b/test/cluster_tls_test.go index fe9f554ba63..f9788ad2732 100644 --- a/test/cluster_tls_test.go +++ b/test/cluster_tls_test.go @@ -52,15 +52,15 @@ func TestBasicTLSClusterPubSub(t *testing.T) { sendA("PING\r\n") expectA(pongRe) + if err := checkExpectedSubs(1, srvA, srvB); err != nil { + t.Fatalf("%v", err) + } + sendB, expectB := setupConn(t, clientB) sendB("PUB foo 2\r\nok\r\n") sendB("PING\r\n") expectB(pongRe) - if err := checkExpectedSubs(1, srvA, srvB); err != nil { - t.Fatalf("%v", err) - } - expectMsgs := expectMsgsCommand(t, expectA) matches := expectMsgs(1) diff --git a/test/new_routes_test.go b/test/new_routes_test.go index b882e3ae858..cf5c3aee8ff 100644 --- a/test/new_routes_test.go +++ b/test/new_routes_test.go @@ -820,6 +820,11 @@ func TestNewRouteQueueSubsDistribution(t *testing.T) { sendB("PING\r\n") expectB(pongRe) + // Each server should have its 100 local subscriptions, plus 1 for the route. + if err := checkExpectedSubs(101, srvA, srvB); err != nil { + t.Fatal(err.Error()) + } + sender := createClientConn(t, optsA.Host, optsA.Port) defer sender.Close() send, expect := setupConn(t, sender)