From 587ab4033e2b9cb54b0bc5b1ced70c79133d745d Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 31 Aug 2018 11:55:50 +0200
Subject: [PATCH] Bump Go to 1.10.4

Includes fixes to the go command, linker, and the net/http, mime/multipart,
ld/macho, bytes, and strings packages. See the Go 1.10.4 milestone on the
issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.10.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 11b4630f4c73885123336b7917cc139c43cf413a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3920ea81ea2cab8e1f5f17fb16e133cfb87d9c98
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 ffeadc6846..badc103de1 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.3
+GO_VERSION:=1.10.4
 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 8cfbbcd2bd..353e378e47 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.3
+GO_VERSION:=1.10.4
 GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
 SUFFIX=ce
 DEB_VERSION?=$(shell SUFFIX=$(SUFFIX) ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile
index 9435288ad5..88c8dcf04b 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.3
+GO_VERSION:=1.10.4
 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 9f80898433..c2c07f133b 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.3
+GO_VERSION:=1.10.4
 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