containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow not specifying type with --mount flag 

Docker does not require `--type` to be passed, defaulting to
`type=volume` in cases where it's not passed. Do the same in our
volume parsing, and add a test to verify this works as expected.

Fixes #26101

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon 2025-05-29 13:48:59 -04:00
parent 775a85004f
commit 3837339e0e
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/specgenutilexternal/mount.go
View File

@ -6,10 +6,6 @@ import (
"strings" "strings"
) )
var (
errInvalidSyntax = errors.New("incorrect mount format: should be --mount type=<bind|glob|tmpfs|volume>,[src=<host-dir|volume-name>,]target=<ctr-dir>[,options]")
)
// FindMountType parses the input and extracts the type of the mount type and // FindMountType parses the input and extracts the type of the mount type and
// the remaining non-type tokens. // the remaining non-type tokens.
func FindMountType(input string) (mountType string, tokens []string, err error) { func FindMountType(input string) (mountType string, tokens []string, err error) {
@ -22,7 +18,7 @@ func FindMountType(input string) (mountType string, tokens []string, err error)
return "", nil, err return "", nil, err
} }
if len(records) != 1 { if len(records) != 1 {
return "", nil, errInvalidSyntax return "", nil, errors.New("incorrect mount format: should be --mount type=<bind|glob|tmpfs|volume>,[src=<host-dir|volume-name>,]target=<ctr-dir>[,options]")
} }
for _, s := range records[0] { for _, s := range records[0] {
kv := strings.Split(s, "=") kv := strings.Split(s, "=")
@ -34,7 +30,7 @@ func FindMountType(input string) (mountType string, tokens []string, err error)
found = true found = true
} }
if !found { if !found {
err = errInvalidSyntax mountType = "volume"
} }
return return
} }

9
test/e2e/run_volume_test.go
View File

@ -1122,4 +1122,13 @@ RUN chmod 755 /test1 /test2 /test3`, ALPINE)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
}) })
It("--mount flag defaults to volume if no type given", func() {
volName := "testvol"
podmanTest.PodmanExitCleanly("volume", "create", volName)
podmanTest.PodmanExitCleanly("run", "--rm", "--mount", fmt.Sprintf("src=%s,dest=/mnt", volName), ALPINE, "touch", "/mnt/testfile")
outTest := podmanTest.PodmanExitCleanly("run", "--rm", "--mount", fmt.Sprintf("type=volume,src=%s,dest=/mnt", volName), ALPINE, "ls", "/mnt")
Expect(outTest.OutputToString()).To(ContainSubstring("testfile"))
})
}) })