toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'engine' from git@github.com:moby/moby master

Browse Source
This commit is contained in:
GordonTheTurtle
2018-02-07 17:06:12 +00:00
parent c599863a52 0919d8f13e
commit e1fe1c5e0c
5 changed files with 75 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/container_operations_windows.go
+1 -1
View File
@@ -165,7 +165,7 @@ func enableIPOnPredefinedNetwork() bool {
}
func (daemon *Daemon) isNetworkHotPluggable() bool {
return false
return true
}
func setupPathsAndSandboxOptions(container *container.Container, sboxOptions *[]libnetwork.SandboxOption) error {
components/engine/daemon/daemon_unix.go
+4
View File
@@ -103,6 +103,10 @@ func getMemoryResources(config containertypes.Resources) *specs.LinuxMemory {
memory.Swappiness = &swappiness
}
if config.OomKillDisable != nil {
memory.DisableOOMKiller = config.OomKillDisable
}
if config.KernelMemory != 0 {
memory.Kernel = &config.KernelMemory
}
components/engine/integration-cli/docker_api_containers_unix_test.go
-77
View File
@@ -1,77 +0,0 @@
// +build !windows
package main
import (
"io/ioutil"
"os"
"path/filepath"
"github.com/docker/docker/api/types"
containertypes "github.com/docker/docker/api/types/container"
mounttypes "github.com/docker/docker/api/types/mount"
networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/system"
"github.com/go-check/check"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
func (s *DockerSuite) TestContainersAPINetworkMountsNoChown(c *check.C) {
// chown only applies to Linux bind mounted volumes; must be same host to verify
testRequires(c, DaemonIsLinux, SameHostDaemon)
tmpDir, err := ioutils.TempDir("", "test-network-mounts")
c.Assert(err, checker.IsNil)
defer os.RemoveAll(tmpDir)
// make tmp dir readable by anyone to allow userns process to mount from
err = os.Chmod(tmpDir, 0755)
c.Assert(err, checker.IsNil)
// create temp files to use as network mounts
tmpNWFileMount := filepath.Join(tmpDir, "nwfile")
err = ioutil.WriteFile(tmpNWFileMount, []byte("network file bind mount"), 0644)
c.Assert(err, checker.IsNil)
config := containertypes.Config{
Image: "busybox",
}
hostConfig := containertypes.HostConfig{
Mounts: []mounttypes.Mount{
{
Type: "bind",
Source: tmpNWFileMount,
Target: "/etc/resolv.conf",
},
{
Type: "bind",
Source: tmpNWFileMount,
Target: "/etc/hostname",
},
{
Type: "bind",
Source: tmpNWFileMount,
Target: "/etc/hosts",
},
},
}
cli, err := client.NewEnvClient()
c.Assert(err, checker.IsNil)
defer cli.Close()
ctrCreate, err := cli.ContainerCreate(context.Background(), &config, &hostConfig, &networktypes.NetworkingConfig{}, "")
c.Assert(err, checker.IsNil)
// container will exit immediately because of no tty, but we only need the start sequence to test the condition
err = cli.ContainerStart(context.Background(), ctrCreate.ID, types.ContainerStartOptions{})
c.Assert(err, checker.IsNil)
// check that host-located bind mount network file did not change ownership when the container was started
statT, err := system.Stat(tmpNWFileMount)
c.Assert(err, checker.IsNil)
assert.Equal(c, uint32(0), statT.UID(), "bind mounted network file should not change ownership from root")
}
components/engine/integration/container/mounts_linux_test.go
+59
View File
@@ -9,8 +9,15 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/daemon"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/system"
"github.com/gotestyourself/gotestyourself/fs"
"github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestContainerShmNoLeak(t *testing.T) {
@@ -82,3 +89,55 @@ func TestContainerShmNoLeak(t *testing.T) {
t.Fatalf("mount leaked: %s", string(out))
}
}
func TestContainerNetworkMountsNoChown(t *testing.T) {
// chown only applies to Linux bind mounted volumes; must be same host to verify
skip.If(t, testEnv.DaemonInfo.OSType != "linux" || !testEnv.IsLocalDaemon())
defer setupTest(t)()
ctx := context.Background()
tmpDir := fs.NewDir(t, "network-file-mounts", fs.WithMode(0755), fs.WithFile("nwfile", "network file bind mount", fs.WithMode(0644)))
defer tmpDir.Remove()
tmpNWFileMount := tmpDir.Join("nwfile")
config := container.Config{
Image: "busybox",
}
hostConfig := container.HostConfig{
Mounts: []mount.Mount{
{
Type: "bind",
Source: tmpNWFileMount,
Target: "/etc/resolv.conf",
},
{
Type: "bind",
Source: tmpNWFileMount,
Target: "/etc/hostname",
},
{
Type: "bind",
Source: tmpNWFileMount,
Target: "/etc/hosts",
},
},
}
cli, err := client.NewEnvClient()
require.NoError(t, err)
defer cli.Close()
ctrCreate, err := cli.ContainerCreate(ctx, &config, &hostConfig, &network.NetworkingConfig{}, "")
require.NoError(t, err)
// container will exit immediately because of no tty, but we only need the start sequence to test the condition
err = cli.ContainerStart(ctx, ctrCreate.ID, types.ContainerStartOptions{})
require.NoError(t, err)
// check that host-located bind mount network file did not change ownership when the container was started
statT, err := system.Stat(tmpNWFileMount)
require.NoError(t, err)
assert.Equal(t, uint32(0), statT.UID(), "bind mounted network file should not change ownership from root")
}
components/engine/integration/container/rename_test.go
+11 -54
View File
@@ -7,22 +7,11 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func runContainer(ctx context.Context, t *testing.T, client client.APIClient, cntCfg *container.Config, hstCfg *container.HostConfig, nwkCfg *network.NetworkingConfig, cntName string) string {
cnt, err := client.ContainerCreate(ctx, cntCfg, hstCfg, nwkCfg, cntName)
require.NoError(t, err)
err = client.ContainerStart(ctx, cnt.ID, types.ContainerStartOptions{})
require.NoError(t, err)
return cnt.ID
}
// This test simulates the scenario mentioned in #31392:
// Having two linked container, renaming the target and bringing a replacement
// and then deleting and recreating the source container linked to the new target.
@@ -32,57 +21,25 @@ func TestRenameLinkedContainer(t *testing.T) {
ctx := context.Background()
client := request.NewAPIClient(t)
cntConfig := &container.Config{
Image: "busybox",
Tty: true,
Cmd: strslice.StrSlice([]string{"top"}),
}
aID := runSimpleContainer(ctx, t, client, "a0")
var (
aID, bID string
cntJSON types.ContainerJSON
err error
)
bID := runSimpleContainer(ctx, t, client, "b0", func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig) {
hostConfig.Links = []string{"a0"}
})
aID = runContainer(ctx, t, client,
cntConfig,
&container.HostConfig{},
&network.NetworkingConfig{},
"a0",
)
bID = runContainer(ctx, t, client,
cntConfig,
&container.HostConfig{
Links: []string{"a0"},
},
&network.NetworkingConfig{},
"b0",
)
err = client.ContainerRename(ctx, aID, "a1")
err := client.ContainerRename(ctx, aID, "a1")
require.NoError(t, err)
runContainer(ctx, t, client,
cntConfig,
&container.HostConfig{},
&network.NetworkingConfig{},
"a0",
)
runSimpleContainer(ctx, t, client, "a0")
err = client.ContainerRemove(ctx, bID, types.ContainerRemoveOptions{Force: true})
require.NoError(t, err)
bID = runContainer(ctx, t, client,
cntConfig,
&container.HostConfig{
Links: []string{"a0"},
},
&network.NetworkingConfig{},
"b0",
)
bID = runSimpleContainer(ctx, t, client, "b0", func(config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig) {
hostConfig.Links = []string{"a0"}
})
cntJSON, err = client.ContainerInspect(ctx, bID)
inspect, err := client.ContainerInspect(ctx, bID)
require.NoError(t, err)
assert.Equal(t, []string{"/a0:/b0/a0"}, cntJSON.HostConfig.Links)
assert.Equal(t, []string{"/a0:/b0/a0"}, inspect.HostConfig.Links)
}