summaryrefslogtreecommitdiff
path: root/cmd/podman/pull.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-01-11 10:33:25 -0600
committerbaude <bbaude@redhat.com>2019-01-30 08:44:58 -0600
commit735f0de6336fa8db7465ce4aaa5b6de203816aa9 (patch)
tree25ec04f14357a7a65aed89b3ca5d5a33c45d6ef5 /cmd/podman/pull.go
parentb71088a01e1e43b87214aaca87c73865fa3b990e (diff)
downloadpodman-735f0de6336fa8db7465ce4aaa5b6de203816aa9.tar.gz
podman-735f0de6336fa8db7465ce4aaa5b6de203816aa9.tar.bz2
podman-735f0de6336fa8db7465ce4aaa5b6de203816aa9.zip
Changes to container runlabel for toolbox project
The toolbox project would benefit from a few changes to more closely resembe the original atomic cli project. Changes made are: * only pull image for container runlabel if the label exists in the image * if a container image does not have the desired label, exit with non-zero Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman/pull.go')
-rw-r--r--cmd/podman/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
index 2a78d0c54..f70e5cded 100644
--- a/cmd/podman/pull.go
+++ b/cmd/podman/pull.go
@@ -123,7 +123,7 @@ func pullCmd(c *cli.Context) error {
imgID = newImage[0].ID()
} else {
authfile := getAuthFile(c.String("authfile"))
- newImage, err := runtime.New(getContext(), image, c.String("signature-policy"), authfile, writer, &dockerRegistryOptions, image2.SigningOptions{}, true)
+ newImage, err := runtime.New(getContext(), image, c.String("signature-policy"), authfile, writer, &dockerRegistryOptions, image2.SigningOptions{}, true, nil)
if err != nil {
return errors.Wrapf(err, "error pulling image %q", image)
}