From 51feec3785a38dea1626f6276d028e22271ea326 Mon Sep 17 00:00:00 2001 From: NathanHaim Date: Mon, 5 Mar 2018 02:46:35 +0100 Subject: [PATCH 1/3] change golang version --- build/Dockerfile | 2 +- vagrant-common.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index b65242cd..53e9101a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.1 +FROM golang:1.8.7-stretch # Support Raspberry Pi 2 and newer ENV GOARM 7 diff --git a/vagrant-common.rb b/vagrant-common.rb index 27cfb716..6fe92996 100644 --- a/vagrant-common.rb +++ b/vagrant-common.rb @@ -16,7 +16,7 @@ def ansibleize(h) end def get_go_version_from_build_dockerfile() - go_regexp = /FROM golang:(\S*).*?/ + go_regexp = /FROM golang:([\d\.]*).*?/ dockerfile_path = File.expand_path(File.join(File.dirname(__FILE__), 'build', 'Dockerfile')) go_version = File.readlines(dockerfile_path).select { |line| line.match(go_regexp) }.first.match(go_regexp).captures.first if go_version.nil? From 093174e757f85d8ade48534d7905906239095a81 Mon Sep 17 00:00:00 2001 From: NathanHaim Date: Sun, 11 Mar 2018 23:08:41 +0100 Subject: [PATCH 2/3] add golang:1.10.0 --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 53e9101a..d96f3cce 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8.7-stretch +FROM golang:1.10.0-stretch # Support Raspberry Pi 2 and newer ENV GOARM 7 From d35d9311798203e1b539f725c5f64013fa8159ee Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Wed, 21 Feb 2018 15:17:31 +0100 Subject: [PATCH 3/3] Fix invalid format in ipam/testutils_test.go Caught after upgrading Go to 1.10 in build tools. --- ipam/testutils_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipam/testutils_test.go b/ipam/testutils_test.go index d6b2f07f..ccd6efe1 100644 --- a/ipam/testutils_test.go +++ b/ipam/testutils_test.go @@ -117,7 +117,7 @@ func CheckAllExpectedMessagesSent(allocs ...*Allocator) { m := alloc.gossip.(*mockGossipComms) m.RLock() if len(m.messages) > 0 { - require.FailNow(m, fmt.Sprintf("%s: Gossip message(s) not sent as expected: \n%x", m.name, m.messages)) + require.FailNow(m, fmt.Sprintf("%s: Gossip message(s) not sent as expected: \n%v", m.name, m.messages)) } m.RUnlock() }