Merge pull request #2015 from kolyshkin/18.09-golang-1.11.12

[18.09] Bump Go to 1.11.12
2019-08-06 22:56:56 +02:00
parent 62f123fbd2 e065aa2798
commit 0feb4080ba
6 changed files with 7 additions and 7 deletions
--- 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.11.11
+  GOVERSION: 1.11.12
  DEPVERSION: v0.4.1

 install:
@ -20,4 +20,4 @@ build_script:
  - ps: .\scripts\make.ps1 -Binary

 test_script:
-  - ps: .\scripts\make.ps1 -TestUnit
+  - ps: .\scripts\make.ps1 -TestUnit
--- a/dockerfiles/Dockerfile.binary-native
+++ b/dockerfiles/Dockerfile.binary-native
@ -1,4 +1,4 @@
-FROM    golang:1.11.11-alpine
+FROM    golang:1.11.12-alpine

 RUN     apk add -U git bash coreutils gcc musl-dev

--- a/dockerfiles/Dockerfile.cross
+++ b/dockerfiles/Dockerfile.cross
@ -1,4 +1,4 @@
-FROM	dockercore/golang-cross:1.11.11
+FROM	dockercore/golang-cross:1.11.12
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 WORKDIR /go/src/github.com/docker/cli
 COPY    . .
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@ -1,4 +1,4 @@
-FROM    golang:1.11.11-alpine
+FROM    golang:1.11.12-alpine

 RUN     apk add -U git make bash coreutils ca-certificates curl

--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@ -1,4 +1,4 @@
-ARG GO_VERSION=1.11.11
+ARG GO_VERSION=1.11.12

 FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process

--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@ -1,4 +1,4 @@
-FROM    golang:1.11.11-alpine
+FROM    golang:1.11.12-alpine

 RUN     apk add -U git