diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2021-02-24 23:30:15 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-02-25 13:09:29 -0500 |
| commit | 43d010bd0f9e01d1652e284c77d1839a4bf16607 (patch) | |
| tree | 49d6e1da0e19d8156276a958a57f55f4901f77e5 /cmd/podman/common | |
| parent | 4aaaa6c1df3a1c90a930b97552bcc970d7d99dd4 (diff) | |
| download | podman-43d010bd0f9e01d1652e284c77d1839a4bf16607.tar.gz podman-43d010bd0f9e01d1652e284c77d1839a4bf16607.tar.bz2 podman-43d010bd0f9e01d1652e284c77d1839a4bf16607.zip | |
Fix parsing of Tmpfs field in compat create
Create is not formatted as `key=value` but rather `key:value`
(technically `path:option1,option2`). As such we can't use the
stringMapToArray function, and instead need to generate it
manually.
Fixes #9511
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index c1523b6c1..249355b94 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -311,6 +311,15 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup netInfo.CNINetworks = []string{string(cc.HostConfig.NetworkMode)} } + parsedTmp := make([]string, 0, len(cc.HostConfig.Tmpfs)) + for path, options := range cc.HostConfig.Tmpfs { + finalString := path + if options != "" { + finalString += ":" + options + } + parsedTmp = append(parsedTmp, finalString) + } + // Note: several options here are marked as "don't need". this is based // on speculation by Matt and I. We think that these come into play later // like with start. We believe this is just a difference in podman/compat @@ -367,7 +376,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup StorageOpt: stringMaptoArray(cc.HostConfig.StorageOpt), Sysctl: stringMaptoArray(cc.HostConfig.Sysctls), Systemd: "true", // podman default - TmpFS: stringMaptoArray(cc.HostConfig.Tmpfs), + TmpFS: parsedTmp, TTY: cc.Config.Tty, User: cc.Config.User, UserNS: string(cc.HostConfig.UsernsMode), |