Merge pull request #418 from kolyshkin/19.03-go1.12.12

andrewhsu · web-flow · commit 1e9446fd967f · 2019-10-30T09:47:17.000-07:00
[19.03] Bump golang 1.12.12
Upstream-commit: ddb60aa6d1ba1d9bfbb655fa1f3c3359f82979aa
Component: engine
diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
@@ -25,7 +25,7 @@
 #
 
 ARG CROSS="false"
-ARG GO_VERSION=1.12.10
+ARG GO_VERSION=1.12.12
 ARG DEBIAN_FRONTEND=noninteractive
 
 FROM golang:${GO_VERSION}-stretch AS base
diff --git a/components/engine/Dockerfile.e2e b/components/engine/Dockerfile.e2e
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12.10
+ARG GO_VERSION=1.12.12
 
 FROM golang:${GO_VERSION}-alpine AS base
 
diff --git a/components/engine/Dockerfile.simple b/components/engine/Dockerfile.simple
@@ -5,7 +5,7 @@
 
 # This represents the bare minimum required to build and test Docker.
 
-ARG GO_VERSION=1.12.10
+ARG GO_VERSION=1.12.12
 
 FROM golang:${GO_VERSION}-stretch
 
diff --git a/components/engine/Dockerfile.windows b/components/engine/Dockerfile.windows
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG GO_VERSION=1.12.10
+ARG GO_VERSION=1.12.12
 
 # Environment variable notes:
 #  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#`
`26`	`26`
`27`	`27`	`ARG CROSS="false"`
`28`		`-ARG GO_VERSION=1.12.10`
	`28`	`+ARG GO_VERSION=1.12.12`
`29`	`29`	`ARG DEBIAN_FRONTEND=noninteractive`
`30`	`30`
`31`	`31`	`FROM golang:${GO_VERSION}-stretch AS base`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG GO_VERSION=1.12.10`
	`1`	`+ARG GO_VERSION=1.12.12`
`2`	`2`
`3`	`3`	`FROM golang:${GO_VERSION}-alpine AS base`
`4`	`4`