|
@@ -92,7 +92,7 @@ func TestTmpfsDevShmNoDupMount(t *testing.T) {
|
|
|
}
|
|
|
d := setupFakeDaemon(t, c)
|
|
|
|
|
|
- _, err := d.createSpec(context.TODO(), &configStore{}, c)
|
|
|
+ _, err := d.createSpec(context.TODO(), &configStore{}, c, nil)
|
|
|
assert.Check(t, err)
|
|
|
}
|
|
|
|
|
@@ -110,7 +110,7 @@ func TestIpcPrivateVsReadonly(t *testing.T) {
|
|
|
}
|
|
|
d := setupFakeDaemon(t, c)
|
|
|
|
|
|
- s, err := d.createSpec(context.TODO(), &configStore{}, c)
|
|
|
+ s, err := d.createSpec(context.TODO(), &configStore{}, c, nil)
|
|
|
assert.Check(t, err)
|
|
|
|
|
|
// Find the /dev/shm mount in ms, check it does not have ro
|
|
@@ -139,7 +139,7 @@ func TestSysctlOverride(t *testing.T) {
|
|
|
d := setupFakeDaemon(t, c)
|
|
|
|
|
|
// Ensure that the implicit sysctl is set correctly.
|
|
|
- s, err := d.createSpec(context.TODO(), &configStore{}, c)
|
|
|
+ s, err := d.createSpec(context.TODO(), &configStore{}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
assert.Equal(t, s.Hostname, "foobar")
|
|
|
assert.Equal(t, s.Linux.Sysctl["kernel.domainname"], c.Config.Domainname)
|
|
@@ -155,14 +155,14 @@ func TestSysctlOverride(t *testing.T) {
|
|
|
assert.Assert(t, c.HostConfig.Sysctls["kernel.domainname"] != c.Config.Domainname)
|
|
|
c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"] = "1024"
|
|
|
|
|
|
- s, err = d.createSpec(context.TODO(), &configStore{}, c)
|
|
|
+ s, err = d.createSpec(context.TODO(), &configStore{}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
assert.Equal(t, s.Hostname, "foobar")
|
|
|
assert.Equal(t, s.Linux.Sysctl["kernel.domainname"], c.HostConfig.Sysctls["kernel.domainname"])
|
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"])
|
|
|
|
|
|
// Ensure the ping_group_range is not set on a daemon with user-namespaces enabled
|
|
|
- s, err = d.createSpec(context.TODO(), &configStore{Config: config.Config{RemappedRoot: "dummy:dummy"}}, c)
|
|
|
+ s, err = d.createSpec(context.TODO(), &configStore{Config: config.Config{RemappedRoot: "dummy:dummy"}}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
_, ok := s.Linux.Sysctl["net.ipv4.ping_group_range"]
|
|
|
assert.Assert(t, !ok)
|
|
@@ -170,7 +170,7 @@ func TestSysctlOverride(t *testing.T) {
|
|
|
// Ensure the ping_group_range is set on a container in "host" userns mode
|
|
|
// on a daemon with user-namespaces enabled
|
|
|
c.HostConfig.UsernsMode = "host"
|
|
|
- s, err = d.createSpec(context.TODO(), &configStore{Config: config.Config{RemappedRoot: "dummy:dummy"}}, c)
|
|
|
+ s, err = d.createSpec(context.TODO(), &configStore{Config: config.Config{RemappedRoot: "dummy:dummy"}}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ping_group_range"], "0 2147483647")
|
|
|
}
|
|
@@ -189,7 +189,7 @@ func TestSysctlOverrideHost(t *testing.T) {
|
|
|
d := setupFakeDaemon(t, c)
|
|
|
|
|
|
// Ensure that the implicit sysctl is not set
|
|
|
- s, err := d.createSpec(context.TODO(), &configStore{}, c)
|
|
|
+ s, err := d.createSpec(context.TODO(), &configStore{}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], "")
|
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ping_group_range"], "")
|
|
@@ -197,7 +197,7 @@ func TestSysctlOverrideHost(t *testing.T) {
|
|
|
// Set an explicit sysctl.
|
|
|
c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"] = "1024"
|
|
|
|
|
|
- s, err = d.createSpec(context.TODO(), &configStore{}, c)
|
|
|
+ s, err = d.createSpec(context.TODO(), &configStore{}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
assert.Equal(t, s.Linux.Sysctl["net.ipv4.ip_unprivileged_port_start"], c.HostConfig.Sysctls["net.ipv4.ip_unprivileged_port_start"])
|
|
|
}
|
|
@@ -225,7 +225,7 @@ func TestDefaultResources(t *testing.T) {
|
|
|
}
|
|
|
d := setupFakeDaemon(t, c)
|
|
|
|
|
|
- s, err := d.createSpec(context.Background(), &configStore{}, c)
|
|
|
+ s, err := d.createSpec(context.Background(), &configStore{}, c, nil)
|
|
|
assert.NilError(t, err)
|
|
|
checkResourcesAreUnset(t, s.Linux.Resources)
|
|
|
}
|