diff options
| author | Phil Estes <estesp@linux.vnet.ibm.com> | 2015-10-08 11:51:41 -0400 |
|---|---|---|
| committer | Phil Estes <estesp@linux.vnet.ibm.com> | 2015-10-09 17:47:37 -0400 |
| commit | 442b45628ee12ebd8e8bd08497896d5fa8eec4bd (patch) | |
| tree | 09847155c9f9d8fa5c73e95b0c08e204c34fba48 /integration-cli/docker_cli_cp_test.go | |
| parent | 9a3ab0358ecd657e3754677ff52250fd6cca4422 (diff) | |
| download | docker-442b45628ee12ebd8e8bd08497896d5fa8eec4bd.tar.gz | |
Add user namespace (mapping) support to the Docker engine
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.
Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Diffstat (limited to 'integration-cli/docker_cli_cp_test.go')
| -rw-r--r-- | integration-cli/docker_cli_cp_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go index 3f4b6ed791..5f1b921056 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -559,7 +559,7 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { // Copy actual /etc/resolv.conf dockerCmd(c, "cp", cleanedContainerID+":/etc/resolv.conf", outDir) - expected, err := ioutil.ReadFile("/var/lib/docker/containers/" + cleanedContainerID + "/resolv.conf") + expected, err := readContainerFile(cleanedContainerID, "resolv.conf") actual, err := ioutil.ReadFile(outDir + "/resolv.conf") if !bytes.Equal(actual, expected) { @@ -569,7 +569,7 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { // Copy actual /etc/hosts dockerCmd(c, "cp", cleanedContainerID+":/etc/hosts", outDir) - expected, err = ioutil.ReadFile("/var/lib/docker/containers/" + cleanedContainerID + "/hosts") + expected, err = readContainerFile(cleanedContainerID, "hosts") actual, err = ioutil.ReadFile(outDir + "/hosts") if !bytes.Equal(actual, expected) { @@ -579,7 +579,7 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { // Copy actual /etc/resolv.conf dockerCmd(c, "cp", cleanedContainerID+":/etc/hostname", outDir) - expected, err = ioutil.ReadFile("/var/lib/docker/containers/" + cleanedContainerID + "/hostname") + expected, err = readContainerFile(cleanedContainerID, "hostname") actual, err = ioutil.ReadFile(outDir + "/hostname") if !bytes.Equal(actual, expected) { |