From 1c71c957cbbbec21f9f13b148aef9f2ec7f9b3d7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 11 Jun 2018 09:48:48 -0700 Subject: [PATCH] Bump Golang to 1.10.3 go1.10.3 (released 2018/06/05) includes fixes to the go command, and the crypto/tls, crypto/x509, and strings packages. In particular, it adds minimal support to the go command for the vgo transition. See the Go 1.10.3 milestone on our issue tracker for details; https://github.com/golang/go/issues?q=milestone%3AGo1.10.3 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 262021d8ab..bb1e7d47c5 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 + GOVERSION: 1.10.3 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index ea76ce5fb5..d6fdf533b1 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -FROM golang:1.10.2-alpine +FROM golang:1.10.3-alpine RUN apk add -U git bash coreutils gcc musl-dev diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index 8bc5c2ea4e..40a01b88a5 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,3 +1,3 @@ -FROM dockercore/golang-cross:1.10.2@sha256:297fa4bc113facd7a528699919f86009420a6b5bedbdc89da35c14f7fee047e1 +FROM dockercore/golang-cross:1.10.3@sha256:7671b4ed357fda50124e5679d36c4c3206ded4d43f1d2e0ff3d120a1e2bf94d7 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 WORKDIR /go/src/github.com/docker/cli diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 3ff8ad4de8..1b87ad5bb1 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,5 +1,5 @@ -FROM golang:1.10.2-alpine +FROM golang:1.10.3-alpine RUN apk add -U git make bash coreutils ca-certificates curl diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 4087fb83a5..167bbf0e1e 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.10.2 +ARG GO_VERSION=1.10.3 # Use Debian based image as docker-compose requires glibc. FROM golang:${GO_VERSION} diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 7113062c65..9726eecb42 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM golang:1.10.2-alpine +FROM golang:1.10.3-alpine RUN apk add -U git