From cd1b18d66d5cc5a6010282bda24b3618939ec01a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 23 Jan 2019 23:57:21 +0100 Subject: [PATCH] Bump Golang 1.11.5 (CVE-2019-6486) See the milestone for details; https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn (cherry picked from commit a86dd09775725e0ea79bcc25613879d09d11ba0c) Signed-off-by: Sebastiaan van Stijn Upstream-commit: f571ca6a512ac099bdb5a8cd4c44f6256b60fa70 Component: packaging --- components/packaging/Makefile | 2 +- components/packaging/deb/Makefile | 2 +- components/packaging/image/Makefile | 2 +- components/packaging/rpm/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/packaging/Makefile b/components/packaging/Makefile index e2483ab596..2bff8da8e3 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -5,7 +5,7 @@ VERSION?=0.0.0-dev DOCKER_GITCOMMIT:=abcdefg ARCH=$(shell uname -m) STATIC_VERSION=$(shell static/gen-static-ver $(ENGINE_DIR) $(VERSION)) -GO_VERSION:=1.11.3 +GO_VERSION:=1.11.5 DEFAULT_PRODUCT_LICENSE:=Community Engine PLATFORM=Docker Engine - Community BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 357756b0b5..1a56ccf885 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -6,7 +6,7 @@ CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(CLI_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_BASE_IMAGE=golang -GO_VERSION:=1.11.3 +GO_VERSION:=1.11.5 GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) DEB_VERSION=$(shell ./gen-deb-ver $(CLI_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index 0ed668f48f..2289f3dd85 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -3,7 +3,7 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli VERSION?=0.0.0-dev GO_BASE_IMAGE=golang -GO_VERSION:=1.11.3 +GO_VERSION:=1.11.5 ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION)) DOCKER_HUB_ORG?=dockereng diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 935a694ccd..e3be516c6e 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -6,7 +6,7 @@ CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_BASE_IMAGE=golang -GO_VERSION:=1.11.3 +GO_VERSION:=1.11.5 GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION) GEN_RPM_VER=$(shell ./gen-rpm-ver $(CLI_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown