From 0ffcc61e2be7de0f343c8d61124eeed4e4b9a18e Mon Sep 17 00:00:00 2001
From: Ivan Kozlovic <ivan@synadia.com>
Date: Wed, 24 Jun 2020 12:44:49 -0600
Subject: [PATCH] Release v0.18.0

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
---
 .goreleaser.yml  |  4 ++--
 Dockerfile       | 20 --------------------
 README.md        |  4 ++--
 server/server.go |  2 +-
 4 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 3e9e61d0..b2eeed2b 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -14,7 +14,7 @@ builds:
 - main: ./nats-streaming-server.go
   binary: nats-streaming-server
   ldflags:
-    - -s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=fb009af
+    - -s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=bf0930e
   env:
     - GO111MODULE=off
     - CGO_ENABLED=0
@@ -35,7 +35,7 @@ builds:
       goarch: 386
 
 nfpms:
-  - name_template: '{{.ProjectName}}-{{.Tag}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
+  - file_name_template: '{{.ProjectName}}-{{.Tag}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
     homepage:  https://nats.io
     description: High-Performance Streaming server for NATS, the cloud native messaging system.
     maintainer: Ivan Kozlovic <ivan@synadia.com>
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 74cbb516..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM golang:1.13.7
-
-MAINTAINER Ivan Kozlovic <ivan@synadia.com>
-
-COPY . /go/src/github.com/nats-io/nats-streaming-server
-WORKDIR /go/src/github.com/nats-io/nats-streaming-server
-
-# Set the NATS Server git commit based on the rev that
-# we actually vendor. This can be found in the
-# vendor/manifest file.
-ARG NATS_GIT_COMMIT='github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=fb009af'
-
-RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-amd64/nats-streaming-server
-RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm   GOARM=6 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm6/nats-streaming-server
-RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm   GOARM=7 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm7/nats-streaming-server
-RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm64/nats-streaming-server
-RUN CGO_ENABLED=0 GO111MODULE=off GOOS=windows GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/win-amd64/nats-streaming-server.exe
-
-ENTRYPOINT ["go"]
-CMD ["version"]
diff --git a/README.md b/README.md
index c1cde5c7..cd44332f 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,6 @@ under the Apache Version 2.0 license found in the LICENSE file.
 [Coverage-image]: https://coveralls.io/repos/github/nats-io/nats-streaming-server/badge.svg?branch=master&t=kIxrDE
 [ReportCard-Url]: http://goreportcard.com/report/nats-io/nats-streaming-server
 [ReportCard-Image]: http://goreportcard.com/badge/github.com/nats-io/nats-streaming-server
-[Release-Url]: https://github.com/nats-io/nats-streaming-server/releases/tag/v0.17.0
-[Release-image]: https://img.shields.io/badge/release-v0.17.0-1eb0fc.svg
+[Release-Url]: https://github.com/nats-io/nats-streaming-server/releases/tag/v0.18.0
+[Release-image]: https://img.shields.io/badge/release-v0.18.0-1eb0fc.svg
 [github-release]: https://github.com/nats-io/nats-streaming-server/releases/
diff --git a/server/server.go b/server/server.go
index f8ede5ce..bdcf1405 100644
--- a/server/server.go
+++ b/server/server.go
@@ -47,7 +47,7 @@ import (
 // Server defaults.
 const (
 	// VERSION is the current version for the NATS Streaming server.
-	VERSION = "0.17.0"
+	VERSION = "0.18.0"
 
 	DefaultClusterID      = "test-cluster"
 	DefaultDiscoverPrefix = "_STAN.discover"