summaryrefslogtreecommitdiff
path: root/libpod/image/image.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-02-05 10:34:40 -0500
committerGitHub <noreply@github.com>2019-02-05 10:34:40 -0500
commit3554bfce98bc643bd4724340bf2abbaa6373e70c (patch)
treefb95023c6bb2619114f48d258e36e9486187b6b3 /libpod/image/image.go
parentf30a531de11495dc82015b505dd401aceed8c2ba (diff)
parent735f0de6336fa8db7465ce4aaa5b6de203816aa9 (diff)
downloadpodman-3554bfce98bc643bd4724340bf2abbaa6373e70c.tar.gz
podman-3554bfce98bc643bd4724340bf2abbaa6373e70c.tar.bz2
podman-3554bfce98bc643bd4724340bf2abbaa6373e70c.zip
Merge pull request #2196 from baude/toolbox
Changes to container runlabel for toolbox project
Diffstat (limited to 'libpod/image/image.go')
-rw-r--r--libpod/image/image.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go
index a32336f49..739372e77 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -125,7 +125,7 @@ func (ir *Runtime) NewFromLocal(name string) (*Image, error) {
// New creates a new image object where the image could be local
// or remote
-func (ir *Runtime) New(ctx context.Context, name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *DockerRegistryOptions, signingoptions SigningOptions, forcePull bool) (*Image, error) {
+func (ir *Runtime) New(ctx context.Context, name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *DockerRegistryOptions, signingoptions SigningOptions, forcePull bool, label *string) (*Image, error) {
// We don't know if the image is local or not ... check local first
newImage := Image{
InputName: name,
@@ -145,7 +145,7 @@ func (ir *Runtime) New(ctx context.Context, name, signaturePolicyPath, authfile
if signaturePolicyPath == "" {
signaturePolicyPath = ir.SignaturePolicyPath
}
- imageName, err := ir.pullImageFromHeuristicSource(ctx, name, writer, authfile, signaturePolicyPath, signingoptions, dockeroptions)
+ imageName, err := ir.pullImageFromHeuristicSource(ctx, name, writer, authfile, signaturePolicyPath, signingoptions, dockeroptions, label)
if err != nil {
return nil, errors.Wrapf(err, "unable to pull %s", name)
}