diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-10 15:50:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 15:50:10 -0400 |
| commit | 96bc5eb4b77d00f59a342b7af1f6f3ecd35772a5 (patch) | |
| tree | ea0739b4b1b265c184b9ec57d42e2c84c549911f /cmd/podman | |
| parent | 41bd5e298a8d16d1d43f5e9d5a25e5ec6436e87b (diff) | |
| parent | dfd10d2bcd1104e08609c379c89dffdc3bf8f09b (diff) | |
| download | podman-96bc5eb4b77d00f59a342b7af1f6f3ecd35772a5.tar.gz podman-96bc5eb4b77d00f59a342b7af1f6f3ecd35772a5.tar.bz2 podman-96bc5eb4b77d00f59a342b7af1f6f3ecd35772a5.zip | |
Merge pull request #7577 from rhatdan/runlabel1
podman container runlabel should pull the image if it does not exist
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/runlabel.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go index 81eec2a42..5ee8c9d6c 100644 --- a/cmd/podman/containers/runlabel.go +++ b/cmd/podman/containers/runlabel.go @@ -30,7 +30,7 @@ var ( RunE: runlabel, Args: cobra.MinimumNArgs(2), Example: `podman container runlabel run imageID - podman container runlabel --pull install imageID arg1 arg2 + podman container runlabel install imageID arg1 arg2 podman container runlabel --display run myImage`, } ) @@ -51,7 +51,7 @@ func init() { flags.StringVar(&runlabelOptions.Optional1, "opt1", "", "Optional parameter to pass for install") flags.StringVar(&runlabelOptions.Optional2, "opt2", "", "Optional parameter to pass for install") flags.StringVar(&runlabelOptions.Optional3, "opt3", "", "Optional parameter to pass for install") - flags.BoolP("pull", "p", false, "Pull the image if it does not exist locally prior to executing the label contents") + flags.BoolVarP(&runlabelOptions.Pull, "pull", "p", true, "Pull the image if it does not exist locally prior to executing the label contents") flags.BoolVarP(&runlabelOptions.Quiet, "quiet", "q", false, "Suppress output information when installing images") flags.BoolVar(&runlabelOptions.Replace, "replace", false, "Replace existing container with a new one from the image") flags.StringVar(&runlabelOptions.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") @@ -61,6 +61,7 @@ func init() { _ = flags.MarkHidden("opt1") _ = flags.MarkHidden("opt2") _ = flags.MarkHidden("opt3") + _ = flags.MarkHidden("pull") _ = flags.MarkHidden("signature-policy") if err := flags.MarkDeprecated("pull", "podman will pull if not found in local storage"); err != nil { |