0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2408 from euanh/golang-1.12.6

Browse source 
Update to Golang 1.12.6
This commit is contained in:
Euan Harris 2019-06-27 09:46:29 +01:00 • committed by GitHub
commit 92611bb5f7
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/Dockerfile
View file

@ -1,4 +1,4 @@
FROM golang:1.10.7 as dev FROM golang:1.12.6 as dev
RUN apt-get update && apt-get -y install iptables \ RUN apt-get update && apt-get -y install iptables \
protobuf-compiler protobuf-compiler

2
libnetwork/drivers/bridge/setup_ip_tables.go
View file

@ -302,7 +302,7 @@ func setINC(iface string, enable bool) error {
if i == 1 { if i == 1 {
// Rollback the rule installed on first chain // Rollback the rule installed on first chain
if err2 := iptables.ProgramRule(iptables.Filter, chains[0], iptables.Delete, rules[0]); err2 != nil { if err2 := iptables.ProgramRule(iptables.Filter, chains[0], iptables.Delete, rules[0]); err2 != nil {
logrus.Warn("Failed to rollback iptables rule after failure (%v): %v", err, err2) logrus.Warnf("Failed to rollback iptables rule after failure (%v): %v", err, err2)
} }
} }
return fmt.Errorf(msg) return fmt.Errorf(msg)

6
libnetwork/drivers/overlay/ostweaks_linux.go
View file

@ -7,9 +7,9 @@ import (
) )
var ovConfig = map[string]*kernel.OSValue{ var ovConfig = map[string]*kernel.OSValue{
"net.ipv4.neigh.default.gc_thresh1": {"8192", checkHigher}, "net.ipv4.neigh.default.gc_thresh1": {Value: "8192", CheckFn: checkHigher},
"net.ipv4.neigh.default.gc_thresh2": {"49152", checkHigher}, "net.ipv4.neigh.default.gc_thresh2": {Value: "49152", CheckFn: checkHigher},
"net.ipv4.neigh.default.gc_thresh3": {"65536", checkHigher}, "net.ipv4.neigh.default.gc_thresh3": {Value: "65536", CheckFn: checkHigher},
} }
func checkHigher(val1, val2 string) bool { func checkHigher(val1, val2 string) bool {

2
libnetwork/drivers/windows/windows.go
View file

@ -433,7 +433,7 @@ func convertQosPolicies(qosPolicies []types.QosPolicy) ([]json.RawMessage, error
// understood by the HCS. // understood by the HCS.
for _, elem := range qosPolicies { for _, elem := range qosPolicies {
encodedPolicy, err := json.Marshal(hcsshim.QosPolicy{ encodedPolicy, err := json.Marshal(hcsshim.QosPolicy{
Type: "QOS", Type: "QOS",
MaximumOutgoingBandwidthInBytes: elem.MaxEgressBandwidth, MaximumOutgoingBandwidthInBytes: elem.MaxEgressBandwidth,
}) })

2
libnetwork/network.go
View file

@ -1054,7 +1054,7 @@ func (n *network) delete(force bool, rmLBEndpoint bool) error {
t.Name(), n.Name(), err) t.Name(), n.Name(), err)
} }
} else { } else {
logrus.Warnf("Could not find configuration network %q during removal of network %q", n.configOnly, n.Name()) logrus.Warnf("Could not find configuration network %q during removal of network %q", n.configFrom, n.Name())
} }
} }

2
libnetwork/osl/namespace_linux.go
View file

@ -40,7 +40,7 @@ var (
loadBalancerConfig = map[string]*kernel.OSValue{ loadBalancerConfig = map[string]*kernel.OSValue{
// expires connection from the IPVS connection table when the backend is not available // expires connection from the IPVS connection table when the backend is not available
// more info: https://github.com/torvalds/linux/blob/master/Documentation/networking/ipvs-sysctl.txt#L126:1 // more info: https://github.com/torvalds/linux/blob/master/Documentation/networking/ipvs-sysctl.txt#L126:1
"net.ipv4.vs.expire_nodest_conn": {"1", nil}, "net.ipv4.vs.expire_nodest_conn": {Value: "1", CheckFn: nil},
} }
) )

4
libnetwork/resolvconf/resolvconf_test.go
View file

@ -41,7 +41,7 @@ search example.com`: {"1.2.3.4", "40.3.200.10"},
`nameserver 1.2.3.4 `nameserver 1.2.3.4
search example.com search example.com
nameserver 4.30.20.100`: {"1.2.3.4", "4.30.20.100"}, nameserver 4.30.20.100`: {"1.2.3.4", "4.30.20.100"},
``: {}, ``: {},
` nameserver 1.2.3.4 `: {"1.2.3.4"}, ` nameserver 1.2.3.4 `: {"1.2.3.4"},
`search example.com `search example.com
nameserver 1.2.3.4 nameserver 1.2.3.4
@ -65,7 +65,7 @@ search example.com`: {"1.2.3.4/32", "40.3.200.10/32"},
`nameserver 1.2.3.4 `nameserver 1.2.3.4
search example.com search example.com
nameserver 4.30.20.100`: {"1.2.3.4/32", "4.30.20.100/32"}, nameserver 4.30.20.100`: {"1.2.3.4/32", "4.30.20.100/32"},
``: {}, ``: {},
` nameserver 1.2.3.4 `: {"1.2.3.4/32"}, ` nameserver 1.2.3.4 `: {"1.2.3.4/32"},
`search example.com `search example.com
nameserver 1.2.3.4 nameserver 1.2.3.4