Merge pull request #3968 from thaJeztah/1.2_bump_golang_1.12.15

estesp · web-flow · commit 701a8d0db860 · 2020-01-17T11:58:53.000-05:00
[release/1.2 backport] Update Golang 1.12.15
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -13,7 +13,7 @@ environment:
   GOPATH: C:\gopath
   CGO_ENABLED: 1
   matrix:
-    - GO_VERSION: 1.12.14
+    - GO_VERSION: 1.12.15
 
 before_build:
   - choco install -y mingw --version 5.3.0
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ services:
 language: go
 
 go:
-  - "1.12.14"
+  - "1.12.15"
 os:
   - "linux"
   # TODO ppc64le is currently timing out on travis; see https://github.com/containerd/containerd/pull/2896
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -6,7 +6,7 @@
 # 3.) $ make binaries install test
 #
 
-ARG GOLANG_VERSION=1.12.14
+ARG GOLANG_VERSION=1.12.15
 
 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.14`
	`9`	`+ARG GOLANG_VERSION=1.12.15`
`10`	`10`
`11`	`11`	`FROM golang:${GOLANG_VERSION} AS golang-base`
`12`	`12`	`RUN mkdir -p /go/src/github.com/containerd/containerd`