From 2b2dcff2735c30a49fca0109bbd702572d047c33 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 13 Dec 2018 23:47:15 +0000 Subject: [PATCH] bump to golang 1.10.6 Signed-off-by: Eli Uriegas (cherry picked from commit 010a8c218dacf18f97aa976ac17c3863ec36b9d5) Signed-off-by: Eli Uriegas Upstream-commit: d5e1848a813b3019e44db7581848a66869972e56 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 788dc75208..bb12174fdf 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.10.5 +GO_VERSION:=1.10.6 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 b852b4a223..c8e4a6430b 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.10.5 +GO_VERSION:=1.10.6 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 f490bbe11d..5b3620f337 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.10.5 +GO_VERSION:=1.10.6 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 0a839b3e05..e4a48ccccb 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.10.5 +GO_VERSION:=1.10.6 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