[VOL-2876]
Update grpc-gateway to a version with improved generation of swagger docs
Bump the golang and alpine image patch versions
Change-Id: Id8c772dd782b29586615d585a4cf6c756da0098c
diff --git a/Makefile b/Makefile
index e639bf9..412df42 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,13 @@
VERSION ?= $(shell cat ./VERSION)
GO_JUNIT_REPORT_VERSION ?= "0.9.1"
GOCOVER_COBERTURA_VERSION ?= "v0.0.0-20180217150009-aaee18c8195c"
-GOLANG_VERSION ?= "1.13.8"
+GOLANG_VERSION ?= "1.13.9"
GOLANGCI_LINT_VERSION ?= "1.23.6"
HADOLINT_VERSION ?= "1.17.5"
PROTOC_VERSION ?= "3.7.0"
PROTOC_SHA256SUM ?= "a1b8ed22d6dc53c5b8680a6f1760a305b33ef471bece482e92728f00ba2a2969"
PROTOC_GEN_GO_VERSION ?= "1.3.2"
-PROTOC_GEN_GRPC_GATEWAY_VERSION ?= "1.12.2"
+PROTOC_GEN_GRPC_GATEWAY_VERSION ?= "1.14.3"
# Docker related
DOCKER_LABEL_VCS_DIRTY = false
diff --git a/VERSION b/VERSION
index 7ec1d6d..ccbccc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2.0
diff --git a/docker/go-junit-report.Dockerfile b/docker/go-junit-report.Dockerfile
index 59aff65..7104498 100644
--- a/docker/go-junit-report.Dockerfile
+++ b/docker/go-junit-report.Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.13.8-alpine as build
+FROM golang:1.13.9-alpine as build
RUN apk add --no-cache build-base=0.5-r1
diff --git a/docker/gocover-cobertura.Dockerfile b/docker/gocover-cobertura.Dockerfile
index 1ceaaa1..f0ced49 100644
--- a/docker/gocover-cobertura.Dockerfile
+++ b/docker/gocover-cobertura.Dockerfile
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.13.8-alpine as build
+FROM golang:1.13.9-alpine as build
RUN apk add --no-cache build-base=0.5-r1
diff --git a/docker/protoc.Dockerfile b/docker/protoc.Dockerfile
index 4edf72c..a4ba885 100644
--- a/docker/protoc.Dockerfile
+++ b/docker/protoc.Dockerfile
@@ -12,14 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.13.8-alpine as build
+FROM golang:1.13.9-alpine as build
ARG PROTOC_VERSION
ARG PROTOC_SHA256SUM
ARG PROTOC_GEN_GO_VERSION
ARG PROTOC_GEN_GRPC_GATEWAY_VERSION
-RUN apk add --no-cache libatomic=9.2.0-r3 musl=1.1.24-r0
+RUN apk add --no-cache libatomic=9.2.0-r4 musl=1.1.24-r2
# download & compile this specific version of protoc-gen-go
RUN GO111MODULE=on CGO_ENABLED=0 go get -u \