summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-26 15:07:22 +0200
committerGitHub <noreply@github.com>2019-06-26 15:07:22 +0200
commitda1ef2bdfd52e666a2561e0a012cc3a824938e65 (patch)
treeae0100264e5b0cb8b80ea5e54e68802d6ef9635a /cmd
parente7bf780d5a76cb24169ff3f866467612052e9e17 (diff)
parent77f2e8467a65ce97f44d3efa7c01c6a65c7e4c4d (diff)
downloadpodman-da1ef2bdfd52e666a2561e0a012cc3a824938e65.tar.gz
podman-da1ef2bdfd52e666a2561e0a012cc3a824938e65.tar.bz2
podman-da1ef2bdfd52e666a2561e0a012cc3a824938e65.zip
Merge pull request #3435 from mheon/fix_tmpfs_options
Fix parsing of the --tmpfs option
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common.go2
-rw-r--r--cmd/podman/shared/create.go2
-rw-r--r--cmd/podman/shared/intermediate.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 7a3052653..578094718 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -444,7 +444,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
"systemd", cliconfig.DefaultSystemD,
"Run container in systemd mode if the command executable is systemd or init",
)
- createFlags.StringSlice(
+ createFlags.StringArray(
"tmpfs", []string{},
"Mount a temporary filesystem (`tmpfs`) into a container (default [])",
)
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index eee5f515d..4491e5c1b 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -690,7 +690,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
StopTimeout: c.Uint("stop-timeout"),
Sysctl: sysctl,
Systemd: systemd,
- Tmpfs: c.StringSlice("tmpfs"),
+ Tmpfs: c.StringArray("tmpfs"),
Tty: tty,
User: user,
UsernsMode: usernsMode,
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go
index a38e4d47a..eecd1604c 100644
--- a/cmd/podman/shared/intermediate.go
+++ b/cmd/podman/shared/intermediate.go
@@ -448,7 +448,7 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["subuidname"] = newCRString(c, "subuidname")
m["sysctl"] = newCRStringSlice(c, "sysctl")
m["systemd"] = newCRBool(c, "systemd")
- m["tmpfs"] = newCRStringSlice(c, "tmpfs")
+ m["tmpfs"] = newCRStringArray(c, "tmpfs")
m["tty"] = newCRBool(c, "tty")
m["uidmap"] = newCRStringSlice(c, "uidmap")
m["ulimit"] = newCRStringSlice(c, "ulimit")