diff --git a/Makefile b/Makefile index 3eda76b3a4..2766d55d43 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ GRAVITY_PKG_PATH ?= github.com/gravitational/gravity ASSETSDIR=$(TOP)/assets BINDIR ?= /usr/bin -# Current Kubernetes version: 1.14.5 -K8S_VER := 1.14.5 +# Current Kubernetes version: 1.14.6 +K8S_VER := 1.14.6 # Kubernetes version suffix for the planet package, constructed by concatenating # major + minor padded to 2 chars with 0 + patch also padded to 2 chars, e.g. # 1.13.5 -> 11305, 1.13.12 -> 11312, 2.0.0 -> 20000 and so on @@ -42,7 +42,7 @@ RELEASE_OUT ?= TELEPORT_TAG = 3.2.7 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme TELEPORT_REPOTAG := v$(TELEPORT_TAG) -PLANET_TAG := 6.0.7-$(K8S_VER_SUFFIX) +PLANET_TAG := 6.0.8-$(K8S_VER_SUFFIX) PLANET_BRANCH := $(PLANET_TAG) K8S_APP_TAG := $(GRAVITY_TAG) TELEKUBE_APP_TAG := $(GRAVITY_TAG) diff --git a/build.assets/Dockerfile b/build.assets/Dockerfile index b3a091b1db..7fff1c9435 100644 --- a/build.assets/Dockerfile +++ b/build.assets/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/gravitational/debian-venti:go1.11.5-stretch +FROM quay.io/gravitational/debian-venti:go1.12.9-stretch ARG PROTOC_VER ARG PROTOC_PLATFORM @@ -18,11 +18,11 @@ RUN (mkdir -p /gopath/src/github.com/gravitational/gravity && \ chmod 777 /tmp) ENV LANGUAGE="en_US.UTF-8" \ - LANG="en_US.UTF-8" \ - LC_ALL="en_US.UTF-8" \ - LC_CTYPE="en_US.UTF-8" \ - GOPATH="/gopath" \ - PATH="$PATH:/opt/protoc/bin:/opt/go/bin:/gopath/bin" + LANG="en_US.UTF-8" \ + LC_ALL="en_US.UTF-8" \ + LC_CTYPE="en_US.UTF-8" \ + GOPATH="/gopath" \ + PATH="$PATH:/opt/protoc/bin:/opt/go/bin:/gopath/bin" RUN (mkdir -p /gopath/src/github.com/gravitational && \ cd /gopath/src/github.com/gravitational && \ @@ -36,8 +36,8 @@ RUN (mkdir -p /opt/protoc && \ wget --quiet -O /tmp/${TARBALL} ${PROTOC_URL} && \ unzip -d /opt/protoc /tmp/${TARBALL} && \ go get -u github.com/gogo/protobuf/proto github.com/gogo/protobuf/protoc-gen-gogo github.com/gogo/protobuf/gogoproto \ - github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \ - github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger) + github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \ + github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger) RUN cd ${GOPATH}/src/github.com/gogo/protobuf && git reset --hard ${GOGO_PROTO_TAG} && make install RUN cd ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway && git reset --hard ${GRPC_GATEWAY_TAG} && go install ./protoc-gen-grpc-gateway