Merge pull request #3769 from thaJeztah/1.3_backport_bump_golang_1.12.x

dmcgowan · web-flow · commit 7af311b4200b · 2019-10-22T15:57:33.000-07:00
[release/1.3 backport] Update Golang 1.12.12 (CVE-2019-17596)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,7 +12,7 @@ environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
   matrix:
-    - GO_VERSION: 1.12.10
+    - GO_VERSION: 1.12.12
 
 before_build:
   - choco install -y mingw --version 5.3.0
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ os:
 - linux
 
 go:
-  - "1.12.x"
+  - "1.12.12"
 
 env:
   - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -6,7 +6,7 @@
 # 3.) $ make binaries install test
 #
 
-ARG GOLANG_VERSION=1.12
+ARG GOLANG_VERSION=1.12.12
 
 FROM golang:${GOLANG_VERSION} AS golang-base
 RUN mkdir -p /go/src/github.com/containerd/containerd

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# 3.) $ make binaries install test`
`7`	`7`	`#`
`8`	`8`
`9`		`-ARG GOLANG_VERSION=1.12`
	`9`	`+ARG GOLANG_VERSION=1.12.12`
`10`	`10`
`11`	`11`	`FROM golang:${GOLANG_VERSION} AS golang-base`
`12`	`12`	`RUN mkdir -p /go/src/github.com/containerd/containerd`