From dfd10d2bcd1104e08609c379c89dffdc3bf8f09b Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 9 Sep 2020 15:44:54 -0400
Subject: podman container runlabel should pull the image if it does not exist

Since --pull is deprecated, remove it from help and hide if from --help
Also set it to true by default.

Share image pull code betweern podman image pull and podman container runlabel.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1877181

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/domain/infra/abi/containers_runlabel.go | 32 ++++++++---------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'pkg/domain/infra/abi/containers_runlabel.go')

diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go
index 3983ba3a8..30a5a55b8 100644
--- a/pkg/domain/infra/abi/containers_runlabel.go
+++ b/pkg/domain/infra/abi/containers_runlabel.go
@@ -7,12 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/podman/v2/libpod/image"
 	"github.com/containers/podman/v2/pkg/domain/entities"
 	envLib "github.com/containers/podman/v2/pkg/env"
-	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/podman/v2/utils"
 	"github.com/google/shlex"
 	"github.com/pkg/errors"
@@ -89,29 +87,17 @@ func (ic *ContainerEngine) runlabelImage(ctx context.Context, label string, imag
 		// Fallthrough and pull!
 	}
 
-	// Parse credentials if specified.
-	var credentials *types.DockerAuthConfig
-	if options.Credentials != "" {
-		credentials, err = util.ParseRegistryCreds(options.Credentials)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Suppress pull progress bars if requested.
-	pullOutput := os.Stdout
-	if options.Quiet {
-		pullOutput = nil // c/image/copy takes care of the rest
+	pullOptions := entities.ImagePullOptions{
+		Quiet:           options.Quiet,
+		CertDir:         options.CertDir,
+		SkipTLSVerify:   options.SkipTLSVerify,
+		SignaturePolicy: options.SignaturePolicy,
+		Authfile:        options.Authfile,
 	}
-
-	// Pull the image.
-	dockerRegistryOptions := image.DockerRegistryOptions{
-		DockerCertPath:              options.CertDir,
-		DockerInsecureSkipTLSVerify: options.SkipTLSVerify,
-		DockerRegistryCreds:         credentials,
+	if _, err := pull(ctx, ic.Libpod.ImageRuntime(), imageRef, pullOptions, &label); err != nil {
+		return nil, err
 	}
-
-	return ic.Libpod.ImageRuntime().New(ctx, imageRef, options.SignaturePolicy, options.Authfile, pullOutput, &dockerRegistryOptions, image.SigningOptions{}, &label, util.PullImageMissing)
+	return ic.Libpod.ImageRuntime().NewFromLocal(imageRef)
 }
 
 // generateRunlabelCommand generates the to-be-executed command as a string
-- 
cgit v1.2.3-54-g00ecf