From 29233058d52ab604886d2cf9d4f8af823273d260 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 8 Jul 2019 11:33:07 +0200 Subject: [PATCH] Bump golang 1.11.11 go1.11.11 (released 2019/06/11) includes a fix to the crypto/x509 package. See the Go 1.11.11 milestone on the issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.11.11 Signed-off-by: Sebastiaan van Stijn Upstream-commit: f33c398df1eabda69ca05ff6c5c45351790a8696 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 2bff8da8e3..139580320e 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.5 +GO_VERSION:=1.11.11 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 1a56ccf885..2af689b061 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.5 +GO_VERSION:=1.11.11 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 2289f3dd85..2698ca9670 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.5 +GO_VERSION:=1.11.11 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 e3be516c6e..71fb6257b3 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.5 +GO_VERSION:=1.11.11 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