Merge pull request #3253 from NathanHaim/issues/3245_change_golang_version

Update golang version to 1.10
This commit is contained in:
Bryan Boreham authored and GitHub committed 2018-03-12 12:11:30 +00:00
commit 8afc6f208d
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
FROM golang:1.8.1
FROM golang:1.10.0-stretch
# Support Raspberry Pi 2 and newer
ENV GOARM 7
+1 -1
View File
@@ -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()
}
+1 -1
View File
@@ -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?