Merge pull request moby#39355 from tao12345666333/bump-golang-1.12.6

Bump Golang 1.12.6
thaJeztah · Jun 18, 2019 · 384c782 · 384c782
2 parents 4866f51 + 6f446d0
commit 384c782
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,7 @@
 
 ARG CROSS="false"
 
-FROM golang:1.12.5 AS base
+FROM golang:1.12.6 AS base
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org
 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM golang:1.12.5-alpine as base
+FROM golang:1.12.6-alpine as base
 
 RUN apk --no-cache add \
     bash \

diff --git a/Dockerfile.simple b/Dockerfile.simple
@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-FROM golang:1.12.5
+FROM golang:1.12.6
 
 # allow replacing httpredir or deb mirror
 ARG APT_MIRROR=deb.debian.org

diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
 #  - FROM_DOCKERFILE is used for detection of building within a container.
-ENV GO_VERSION=1.12.5 `
+ENV GO_VERSION=1.12.6 `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\go `
     FROM_DOCKERFILE=1