diff --git a/appveyor.yml b/appveyor.yml index 3c97bc59fc..0bd96d3892 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.4 + GOVERSION: 1.10.5 DEPVERSION: v0.4.1 install: diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index 8dd181d2c4..60c1b50851 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -FROM golang:1.10.4-alpine +FROM golang:1.10.5-alpine RUN apk add -U git bash coreutils gcc musl-dev diff --git a/dockerfiles/Dockerfile.cross b/dockerfiles/Dockerfile.cross index 658315cb54..06ffdd471d 100644 --- a/dockerfiles/Dockerfile.cross +++ b/dockerfiles/Dockerfile.cross @@ -1,3 +1,3 @@ -FROM dockercore/golang-cross:1.10.4@sha256:55c7b933ac944f4922b673b4d4340d1a0404f3c324bd0b3f13a4326c427b1f2a +FROM dockercore/golang-cross:1.10.5@sha256:e41607859366a2480445d196a5a502817e5f6ab90e8b5f55db95375fec0c0008 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 WORKDIR /go/src/github.com/docker/cli diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 73895b2116..6e0907c3f0 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,5 +1,5 @@ -FROM golang:1.10.4-alpine +FROM golang:1.10.5-alpine RUN apk add -U git make bash coreutils ca-certificates curl diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index bed83e0e18..64b6d786f9 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.10.4 +ARG GO_VERSION=1.10.5 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 8be79615be..63c014e075 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM golang:1.10.4-alpine +FROM golang:1.10.5-alpine RUN apk add -U git