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

Merge pull request #10622 from estesp/10618-err-ondup-bind-vols

Browse source 
Don't allow duplicate `-v` specifications for the same target
This commit is contained in:
Jessie Frazelle 2015-02-06 15:03:56 -08:00
commit 271a073a04
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/volumes.go
View file

@ -158,6 +158,10 @@ func (container *Container) parseVolumeMountConfig() (map[string]*Mount, error)
if err != nil {
return nil, err
}
// Check if a bind mount has already been specified for the same container path
if m, exists := mounts[mountToPath]; exists {
return nil, fmt.Errorf("Duplicate volume %q: %q already in use, mounted from %q", path, mountToPath, m.volume.Path)
}
// Check if a volume already exists for this and use it
vol, err := container.daemon.volumes.FindOrCreateVolume(path, writable)
if err != nil {

15
integration-cli/docker_cli_run_test.go
View file

@ -493,6 +493,21 @@ func TestVolumesFromGetsProperMode(t *testing.T) {
logDone("run - volumes from ignores `rw` if inherrited volume is `ro`")
}
// Test for GH#10618
func TestRunNoDupVolumes(t *testing.T) {
cmd := exec.Command(dockerBinary, "run", "-v", "/etc:/someplace", "-v", "/usr/lib:/someplace", "busybox", "echo", "hi")
if out, _, err := runCommandWithOutput(cmd); err == nil {
t.Fatal("Expected error about duplicate volume definitions")
} else {
if !strings.Contains(out, "Duplicate volume") {
t.Fatalf("Expected 'duplicate volume' error, got %v", err)
}
}
deleteAllContainers()
logDone("run - don't allow multiple (bind) volumes on the same container target")
}
// Test for #1351
func TestRunApplyVolumesFromBeforeVolumes(t *testing.T) {
cmd := exec.Command(dockerBinary, "run", "--name", "parent", "-v", "/test", "busybox", "touch", "/test/foo")