Skip to content

[18.06] backport: bump Go to 1.10.4 - #1328

Merged
silvin-lubecki merged 1 commit into
docker:18.06from
thaJeztah:18.06_backport_bump_golang_1.10.4
Aug 30, 2018
Merged

[18.06] backport: bump Go to 1.10.4#1328
silvin-lubecki merged 1 commit into
docker:18.06from
thaJeztah:18.06_backport_bump_golang_1.10.4

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

backport of #1315 for 18.06. Minor conflict in dockerfiles/Dockerfile.e2e;

diff --cc dockerfiles/Dockerfile.e2e
index 167bbf0e,581f505e..00000000
--- a/dockerfiles/Dockerfile.e2e+++ b/dockerfiles/Dockerfile.e2e@@@ -1,4 -1,7 +1,11 @@@
++<<<<<<< HEAD
+ARG GO_VERSION=1.10.3
++=======+ ARG GO_VERSION=1.10.4++ FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process+++>>>>>>> 44ca0901... Bump Go to 1.10.4
# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}

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

(cherry picked from commit 44ca090)

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 44ca090)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztahthaJeztah added this to the 18.06.1 milestone Aug 30, 2018
@thaJeztahthaJeztah changed the title Bump Go to 1.10.4[18.06] backport: bump Go to 1.10.4Aug 30, 2018
@thaJeztahthaJeztah modified the milestones: 18.06.1, 18.06.2Aug 30, 2018

@silvin-lubeckisilvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki
silvin-lubecki merged commit a80c6e1 into docker:18.06Aug 30, 2018
@thaJeztah
thaJeztah deleted the 18.06_backport_bump_golang_1.10.4 branch August 30, 2018 14:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah@silvin-lubecki@GordonTheTurtle