diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-29 11:47:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 11:47:20 -0500 |
| commit | 0fe3d43ef1c6dce6ae931aba53dc68d80e42e4da (patch) | |
| tree | f93633b4041ec7cacad2ff1380e987f5c9dd6265 /pkg/domain/infra | |
| parent | 0c6a889a7ec93964a12a10870920727e13e438c3 (diff) | |
| parent | 59076888d9013fdfa4800b3fe61e008abf5e61e9 (diff) | |
| download | podman-0fe3d43ef1c6dce6ae931aba53dc68d80e42e4da.tar.gz podman-0fe3d43ef1c6dce6ae931aba53dc68d80e42e4da.tar.bz2 podman-0fe3d43ef1c6dce6ae931aba53dc68d80e42e4da.zip | |
Merge pull request #9133 from rhatdan/pull1
Cleanup bindings for image pull
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/tunnel/images.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go index 878e7b999..0fe2387d7 100644 --- a/pkg/domain/infra/tunnel/images.go +++ b/pkg/domain/infra/tunnel/images.go @@ -106,8 +106,9 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, opts entities.ImagePullOptions) (*entities.ImagePullReport, error) { options := new(images.PullOptions) - options.WithAllTags(opts.AllTags).WithAuthfile(opts.Authfile).WithCertDir(opts.CertDir).WithArch(opts.Arch).WithOS(opts.OS) - options.WithVariant(opts.Variant).WithPassword(opts.Password).WithPullPolicy(opts.PullPolicy) + options.WithAllTags(opts.AllTags).WithAuthfile(opts.Authfile).WithArch(opts.Arch).WithOS(opts.OS) + options.WithVariant(opts.Variant).WithPassword(opts.Password) + options.WithQuiet(opts.Quiet).WithUsername(opts.Username) if s := opts.SkipTLSVerify; s != types.OptionalBoolUndefined { if s == types.OptionalBoolTrue { options.WithSkipTLSVerify(true) @@ -115,7 +116,6 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, opts entities. options.WithSkipTLSVerify(false) } } - options.WithQuiet(opts.Quiet).WithSignaturePolicy(opts.SignaturePolicy).WithUsername(opts.Username) pulledImages, err := images.Pull(ir.ClientCtx, rawImage, options) if err != nil { return nil, err |