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

Don't allow duplicate -v specifications for the same target

Browse Source 
Addresses: #10618

Given that the user has no notification that they tried to bind mount
different directories on the same target in the container, this errors
out in that case, without changing the current code allowing for
--volumes-from to trump -v/VOLUME specifications.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d1f33d12d4126aae80c51ab1075a5b8323a5f957
Component: engine
This commit is contained in:
Phil Estes
2015-02-06 17:00:53 -05:00
parent 88b86ea3ea
commit b33f390dce
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/engine/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")