From f79533d720b900b488bccee6eb7dd081f14abb53 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 15 Aug 2019 15:39:20 -0700 Subject: [PATCH 1/2] Revert "Apply load balancer properly" This reverts commit 9f58c475940fb0c0d4b69de0af7787b62a40481f. This commit is causing TestCreateParallel to be flaky Signed-off-by: Arko Dasgupta --- libnetwork/osl/namespace_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetwork/osl/namespace_linux.go b/libnetwork/osl/namespace_linux.go index 3e3e5f620c..ed44311418 100644 --- a/libnetwork/osl/namespace_linux.go +++ b/libnetwork/osl/namespace_linux.go @@ -681,7 +681,7 @@ func (n *networkNamespace) ApplyOSTweaks(types []SandboxType) { for _, t := range types { switch t { case SandboxTypeLoadBalancer: - n.InvokeFunc(func() { kernel.ApplyOSTweaks(loadBalancerConfig) }) + kernel.ApplyOSTweaks(loadBalancerConfig) } } } From 4818e8975194acd579b9e8befb213eb572c734d7 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 15 Aug 2019 15:40:33 -0700 Subject: [PATCH 2/2] Bump the GO Version to 1.12.8 which contains security fixes https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/golang-announce/65QixT3tcmg/DrFiG6vvCwAJ Also pin to -stretch Signed-off-by: Arko Dasgupta --- libnetwork/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetwork/Dockerfile b/libnetwork/Dockerfile index 20a04a437f..89302519b1 100644 --- a/libnetwork/Dockerfile +++ b/libnetwork/Dockerfile @@ -1,6 +1,6 @@ -ARG GO_VERSION=1.12.6 +ARG GO_VERSION=1.12.8 -FROM golang:${GO_VERSION} as dev +FROM golang:${GO_VERSION}-stretch as dev RUN apt-get update && apt-get -y install iptables \ protobuf-compiler