From 5d955e1ef5c63d074b497f10b2b1bb12b4f72574 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 9 Apr 2019 17:01:27 +0200
Subject: [PATCH] Bump Golang 1.11.8

go1.11.8 (released 2019/04/08) fixes an issue where using the prebuilt binary
releases on older versions of GNU/Linux led to failures when linking programs
that used cgo. Only Linux users who hit this issue need to update.

See https://github.com/golang/go/issues/31293 for details

Full diff: https://github.com/golang/go/compare/go1.11.7...go1.11.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Jenkinsfile           | 14 +++++++-------
 Makefile              |  6 +++---
 scripts/gen-go-dl-url |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 658c93cf..dd641222 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,17 +126,17 @@ packageLookup = [
 ]
 
 golangRPMImages = [
-	"fedora-27": "golang:1.11.5",
-	"fedora-28": "golang:1.11.5",
-	"centos-7": "dockereng/go-crypto-swap:centos-7-go1.11.5",
-	"sles": "dockereng/go-crypto-swap:sles-12.3-go1.11.5",
+	"fedora-27": "golang:1.11.8",
+	"fedora-28": "golang:1.11.8",
+	"centos-7": "dockereng/go-crypto-swap:centos-7-go1.11.8",
+	"sles": "dockereng/go-crypto-swap:sles-12.3-go1.11.8",
 ]
 
 buildSteps = [:]
 for (rpm in rpms) {
 	arches = packageLookup[rpm]
 	for (arch in arches) {
-		golangImage = "golang:1.11.5"
+		golangImage = "golang:1.11.8"
 		buildImage = rpm.replaceAll('-', ':')
 		if (rpm == 'sles') {
 			buildImage = "dockereng/sles:12.3"
@@ -153,10 +153,10 @@ for (rpm in rpms) {
 
 arches = packageLookup["deb"]
 for (arch in arches) {
-	golangImage = "golang:1.11.5"
+	golangImage = "golang:1.11.8"
 	buildImage = "ubuntu:bionic"
 	if (arch == "x86_64") {
-		golangImage = "dockereng/go-crypto-swap:ubuntu-18.04-go1.11.5"
+		golangImage = "dockereng/go-crypto-swap:ubuntu-18.04-go1.11.8"
 		buildImage = golangImage
 	}
 	buildSteps << genDEBBuild(arch, "deb", golangImage, buildImage)
diff --git a/Makefile b/Makefile
index 71c42698..6ab2c9d5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ GOARCH=$(shell docker run --rm golang go env GOARCH 2>/dev/null)
 ARCH:=$(shell uname -m)
 REF?=$(shell git ls-remote https://github.com/containerd/containerd.git | grep master | awk '{print $$1}')
 RUNC_REF?=2b18fe1d885ee5083ef9f0838fee39b62d653e30
-GOVERSION?=1.11.5
-GOLANG_IMAGE?=golang:1.11.5
+GOVERSION?=1.11.8
+GOLANG_IMAGE?=golang:1.11.8
 
 # need specific repos for s390x
 ifeq ($(ARCH),s390x)
@@ -42,7 +42,7 @@ CONTAINERD_BRANCH?=release/1.2
 CONTAINERD_DIR?=$(shell basename $(CONTAINERD_REPO))
 CONTAINERD_MOUNT?=C:\gopath\src\github.com\containerd\containerd
 WINDOWS_BINARIES=containerd ctr
-WIN_CRYPTO=dockereng/go-crypto-swap:windows-go1.11.5
+WIN_CRYPTO=dockereng/go-crypto-swap:windows-go1.11.8
 
 # Build tags seccomp and apparmor are needed by CRI plugin.
 BUILDTAGS ?= seccomp apparmor
diff --git a/scripts/gen-go-dl-url b/scripts/gen-go-dl-url
index c776b3fe..d4a64f05 100755
--- a/scripts/gen-go-dl-url
+++ b/scripts/gen-go-dl-url
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-GOVERSION=${GOVERSION:-1.11.5}
+GOVERSION=${GOVERSION:-1.11.8}
 HOST_ARCH=${HOST_ARCH:-$(uname -m)}
 DL_ARCH=${HOST_ARCH}