diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-01 12:50:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 12:50:50 -0800 |
| commit | 8ee471f800e91f41fb6c1c1542e41b65ec09695d (patch) | |
| tree | fb97bf28db9b20e15f0278d14255833fdc11f88f /cmd/podman | |
| parent | 467b677451840dbc71853784f3a9b86d2736e30d (diff) | |
| parent | a4b82c03d3f70ac0df712ec9100a59662e86b625 (diff) | |
| download | podman-8ee471f800e91f41fb6c1c1542e41b65ec09695d.tar.gz podman-8ee471f800e91f41fb6c1c1542e41b65ec09695d.tar.bz2 podman-8ee471f800e91f41fb6c1c1542e41b65ec09695d.zip | |
Merge pull request #2495 from baude/runlabelpulldefault
Pull image for runlabel if not local
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/cliconfig/config.go | 1 | ||||
| -rw-r--r-- | cmd/podman/runlabel.go | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index a9032202f..702e20040 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -409,7 +409,6 @@ type RunlabelValues struct { Opt2 string Opt3 string Quiet bool - Pull bool SignaturePolicy string TlsVerify bool } diff --git a/cmd/podman/runlabel.go b/cmd/podman/runlabel.go index bc4e650f9..f91ffed0d 100644 --- a/cmd/podman/runlabel.go +++ b/cmd/podman/runlabel.go @@ -53,10 +53,12 @@ func init() { flags.MarkHidden("opt2") flags.MarkHidden("opt3") - flags.BoolVarP(&runlabelCommand.Pull, "pull", "p", false, "Pull the image if it does not exist locally prior to executing the label contents") + flags.BoolP("pull", "p", false, "Pull the image if it does not exist locally prior to executing the label contents") flags.BoolVarP(&runlabelCommand.Quiet, "quiet", "q", false, "Suppress output information when installing images") flags.StringVar(&runlabelCommand.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") flags.BoolVar(&runlabelCommand.TlsVerify, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries (default: true)") + + flags.MarkDeprecated("pull", "podman will pull if not found in local storage") } // installCmd gets the data from the command line and calls installImage @@ -95,7 +97,6 @@ func runlabelCmd(c *cliconfig.RunlabelValues) error { if len(args) > 2 { extraArgs = args[2:] } - pull := c.Pull label := args[0] runlabelImage := args[1] @@ -131,7 +132,7 @@ func runlabelCmd(c *cliconfig.RunlabelValues) error { } authfile := getAuthFile(c.Authfile) - runLabel, imageName, err := shared.GetRunlabel(label, runlabelImage, ctx, runtime, pull, c.Creds, dockerRegistryOptions, authfile, c.SignaturePolicy, stdOut) + runLabel, imageName, err := shared.GetRunlabel(label, runlabelImage, ctx, runtime, true, c.Creds, dockerRegistryOptions, authfile, c.SignaturePolicy, stdOut) if err != nil { return err } |