diff options
| author | baude <bbaude@redhat.com> | 2019-01-11 10:33:25 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-01-30 08:44:58 -0600 |
| commit | 735f0de6336fa8db7465ce4aaa5b6de203816aa9 (patch) | |
| tree | 25ec04f14357a7a65aed89b3ca5d5a33c45d6ef5 /cmd/podman/shared | |
| parent | b71088a01e1e43b87214aaca87c73865fa3b990e (diff) | |
| download | podman-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/shared')
| -rw-r--r-- | cmd/podman/shared/container.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index 9040c4a5c..f84fb8261 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -609,7 +609,7 @@ func GetRunlabel(label string, runlabelImage string, ctx context.Context, runtim registryCreds = creds } dockerRegistryOptions.DockerRegistryCreds = registryCreds - newImage, err = runtime.ImageRuntime().New(ctx, runlabelImage, signaturePolicyPath, authfile, output, &dockerRegistryOptions, image.SigningOptions{}, false) + newImage, err = runtime.ImageRuntime().New(ctx, runlabelImage, signaturePolicyPath, authfile, output, &dockerRegistryOptions, image.SigningOptions{}, false, &label) } else { newImage, err = runtime.ImageRuntime().NewFromLocal(runlabelImage) } |