summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-08 15:58:48 +0200
committerGitHub <noreply@github.com>2020-04-08 15:58:48 +0200
commit291ad7fbd9797340015b71b448c6637669176878 (patch)
treeb2e61162caa02cb6932180591c76be251e3c5597
parent522dcd604edb6630b06ce1e2184ef11c0ea889f0 (diff)
parent4829136dabeb94635676dc55bb991aea4305aa3b (diff)
downloadpodman-291ad7fbd9797340015b71b448c6637669176878.tar.gz
podman-291ad7fbd9797340015b71b448c6637669176878.tar.bz2
podman-291ad7fbd9797340015b71b448c6637669176878.zip
Merge pull request #5759 from rhatdan/fix
run/create were processing options after the image name
-rw-r--r--cmd/podmanV2/containers/create.go1
-rw-r--r--cmd/podmanV2/containers/run.go1
2 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podmanV2/containers/create.go b/cmd/podmanV2/containers/create.go
index fd5300966..63daf1702 100644
--- a/cmd/podmanV2/containers/create.go
+++ b/cmd/podmanV2/containers/create.go
@@ -40,6 +40,7 @@ func init() {
})
//common.GetCreateFlags(createCommand)
flags := createCommand.Flags()
+ flags.SetInterspersed(false)
flags.AddFlagSet(common.GetCreateFlags(&cliVals))
flags.AddFlagSet(common.GetNetFlags())
flags.SetNormalizeFunc(common.AliasFlags)
diff --git a/cmd/podmanV2/containers/run.go b/cmd/podmanV2/containers/run.go
index bd90aee2f..5c0069afc 100644
--- a/cmd/podmanV2/containers/run.go
+++ b/cmd/podmanV2/containers/run.go
@@ -46,6 +46,7 @@ func init() {
Command: runCommand,
})
flags := runCommand.Flags()
+ flags.SetInterspersed(false)
flags.AddFlagSet(common.GetCreateFlags(&cliVals))
flags.AddFlagSet(common.GetNetFlags())
flags.SetNormalizeFunc(common.AliasFlags)