From 1f467bcdc6957e1b6f27487e1a8c7deb3b1a9aac Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Wed, 23 Jan 2019 23:59:33 +0100
Subject: [PATCH] [18.09] Bump Golang 1.10.8 (CVE-2019-6486)

See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9aec27794cc1e702bd9b9f3ac476695fc0d522a4
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 bb12174fdf..200c1dbf5d 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.6
+GO_VERSION:=1.10.8
 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 c8e4a6430b..dc9577c944 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.6
+GO_VERSION:=1.10.8
 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 5b3620f337..bd5cfe71fe 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.6
+GO_VERSION:=1.10.8
 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 e4a48ccccb..fdffe24b21 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.6
+GO_VERSION:=1.10.8
 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