Skip to content

Bump Golang 1.11.8 #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seemethere merged 1 commit into from
Apr 9, 2019
Merged

Bump Golang 1.11.8 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen-go-dl-url
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}

Expand Down