Merge pull request #4415 from vvoland/dont-ignore-volume-parse-err

cli/container: Don't ignore error when parsing volume spec
This commit is contained in:
Sebastiaan van Stijn 2023-07-15 00:05:56 +02:00 committed by GitHub
commit 424e499b6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions

View File

@ -358,7 +358,10 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con
volumes := copts.volumes.GetMap() volumes := copts.volumes.GetMap()
// add any bind targets to the list of container volumes // add any bind targets to the list of container volumes
for bind := range copts.volumes.GetMap() { for bind := range copts.volumes.GetMap() {
parsed, _ := loader.ParseVolume(bind) parsed, err := loader.ParseVolume(bind)
if err != nil {
return nil, err
}
if parsed.Source != "" { if parsed.Source != "" {
toBind := bind toBind := bind

View File

@ -223,3 +223,8 @@ func TestParseVolumeInvalidSections(t *testing.T) {
_, err := ParseVolume("/foo::rw") _, err := ParseVolume("/foo::rw")
assert.ErrorContains(t, err, "invalid spec") assert.ErrorContains(t, err, "invalid spec")
} }
func TestParseVolumeWithEmptySource(t *testing.T) {
_, err := ParseVolume(":/vol")
assert.ErrorContains(t, err, "empty section between colons")
}

View File

@ -101,3 +101,19 @@ func TestTrustedCreateFromBadTrustServer(t *testing.T) {
Err: "could not rotate trust to a new trusted root", Err: "could not rotate trust to a new trusted root",
}) })
} }
func TestCreateWithEmptySourceVolume(t *testing.T) {
icmd.RunCmd(icmd.Command("docker", "create", "-v", ":/volume", fixtures.AlpineImage)).
Assert(t, icmd.Expected{
ExitCode: 125,
Err: "empty section between colons",
})
}
func TestCreateWithEmptyVolumeSpec(t *testing.T) {
icmd.RunCmd(icmd.Command("docker", "create", "-v", "", fixtures.AlpineImage)).
Assert(t, icmd.Expected{
ExitCode: 125,
Err: "invalid empty volume spec",
})
}