From 44ca0901d17b36510aa6d71c7dfa895ae568d04a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 28 Aug 2018 12:08:52 +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 --- appveyor.yml | 2 +- dockerfiles/Dockerfile.binary-native | 2 +- dockerfiles/Dockerfile.cross | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.e2e | 2 +- dockerfiles/Dockerfile.lint | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bb1e7d47c5..3c97bc59fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli environment: GOPATH: c:\gopath - GOVERSION: 1.10.3 + GOVERSION: 1.10.4 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index d6fdf533b1..8dd181d2c4 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -FROM golang:1.10.3-alpine +FROM golang:1.10.4-alpine RUN apk add -U git bash coreutils gcc musl-dev diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index 40a01b88a5..658315cb54 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,3 +1,3 @@ -FROM dockercore/golang-cross:1.10.3@sha256:7671b4ed357fda50124e5679d36c4c3206ded4d43f1d2e0ff3d120a1e2bf94d7 +FROM dockercore/golang-cross:1.10.4@sha256:55c7b933ac944f4922b673b4d4340d1a0404f3c324bd0b3f13a4326c427b1f2a ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 WORKDIR /go/src/github.com/docker/cli diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 1b87ad5bb1..73895b2116 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,5 +1,5 @@ -FROM golang:1.10.3-alpine +FROM golang:1.10.4-alpine RUN apk add -U git make bash coreutils ca-certificates curl diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 5023c1d2af..581f505e24 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.10.3 +ARG GO_VERSION=1.10.4 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index a55e37faf4..8be79615be 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM golang:1.10.3-alpine +FROM golang:1.10.4-alpine RUN apk add -U git