Fix copy from a "created" container. Fixes #14420
Signed-off-by: Lei Jitang <leijitang@huawei.com>
diff --git a/daemon/container.go b/daemon/container.go
index 3558653..7a92a7c 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -24,6 +24,7 @@
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/broadcastwriter"
+ "github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/jsonlog"
"github.com/docker/docker/pkg/mount"
@@ -604,6 +605,14 @@
if err != nil {
return nil, err
}
+ var stat os.FileInfo
+ stat, err = os.Stat(m.Source)
+ if err != nil {
+ return nil, err
+ }
+ if err = fileutils.CreateIfNotExists(dest, stat.IsDir()); err != nil {
+ return nil, err
+ }
if err = mount.Mount(m.Source, dest, "bind", "rbind,ro"); err != nil {
return nil, err
}
diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go
index fd63bdb..7bd3356 100644
--- a/integration-cli/docker_cli_cp_test.go
+++ b/integration-cli/docker_cli_cp_test.go
@@ -632,3 +632,20 @@
c.Fatalf("expected %q but got %q", expectedMsg, msg)
}
}
+
+func (s *DockerSuite) TestCopyCreatedContainer(c *check.C) {
+ out, err := exec.Command(dockerBinary, "create", "--name", "test_cp", "-v", "/test", "busybox").CombinedOutput()
+ if err != nil {
+ c.Fatalf(string(out), err)
+ }
+
+ tmpDir, err := ioutil.TempDir("", "test")
+ if err != nil {
+ c.Fatalf("unable to make temporary directory: %s", err)
+ }
+ defer os.RemoveAll(tmpDir)
+ out, err = exec.Command(dockerBinary, "cp", "test_cp:/bin/sh", tmpDir).CombinedOutput()
+ if err != nil {
+ c.Fatalf(string(out), err)
+ }
+}
diff --git a/pkg/fileutils/fileutils.go b/pkg/fileutils/fileutils.go
index fdafb53..ce99eea 100644
--- a/pkg/fileutils/fileutils.go
+++ b/pkg/fileutils/fileutils.go
@@ -168,3 +168,23 @@
}
return realPath, nil
}
+
+// CreateIfNotExists creates a file or a directory only if it does not already exist.
+func CreateIfNotExists(path string, isDir bool) error {
+ if _, err := os.Stat(path); err != nil {
+ if os.IsNotExist(err) {
+ if isDir {
+ return os.MkdirAll(path, 0755)
+ }
+ if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+ return err
+ }
+ f, err := os.OpenFile(path, os.O_CREATE, 0755)
+ if err != nil {
+ return err
+ }
+ f.Close()
+ }
+ }
+ return nil
+}
