diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-17 14:55:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-17 14:55:14 +0200 |
| commit | 76f327f73ff9f5ae67a30186007685b8a2e21d67 (patch) | |
| tree | 97f006cbd85cdab9764f52463b6904feba9cdaf5 /pkg/adapter/runtime.go | |
| parent | 098ce2f33a2117a4b18ef49cacd329d44354f984 (diff) | |
| parent | decfea65bed9e84373c8cdc538f79686c0ad40b9 (diff) | |
| download | podman-76f327f73ff9f5ae67a30186007685b8a2e21d67.tar.gz podman-76f327f73ff9f5ae67a30186007685b8a2e21d67.tar.bz2 podman-76f327f73ff9f5ae67a30186007685b8a2e21d67.zip | |
Merge pull request #3617 from QiWang19/create_pull
add --pull flag for podman create&run
Diffstat (limited to 'pkg/adapter/runtime.go')
| -rw-r--r-- | pkg/adapter/runtime.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index c80d5991e..ba988aaf7 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -24,6 +24,7 @@ import ( "github.com/containers/libpod/libpod/events" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/rootless" + "github.com/containers/libpod/pkg/util" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "k8s.io/api/core/v1" @@ -132,8 +133,8 @@ func (r *LocalRuntime) LoadFromArchiveReference(ctx context.Context, srcRef type } // New calls into local storage to look for an image in local storage or to pull it -func (r *LocalRuntime) New(ctx context.Context, name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *image.DockerRegistryOptions, signingoptions image.SigningOptions, forcePull bool, label *string) (*ContainerImage, error) { - img, err := r.Runtime.ImageRuntime().New(ctx, name, signaturePolicyPath, authfile, writer, dockeroptions, signingoptions, forcePull, label) +func (r *LocalRuntime) New(ctx context.Context, name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *image.DockerRegistryOptions, signingoptions image.SigningOptions, label *string, pullType util.PullType) (*ContainerImage, error) { + img, err := r.Runtime.ImageRuntime().New(ctx, name, signaturePolicyPath, authfile, writer, dockeroptions, signingoptions, label, pullType) if err != nil { return nil, err } |