diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-23 21:22:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-23 21:22:41 +0100 |
commit | 02de8d576b531430f90ef2ab7a290c7fb59e9f3c (patch) | |
tree | 9d9d8a2c06f2791e83e77673435253a1a21a42e6 /pkg/adapter/runtime_remote.go | |
parent | 3e835a8025bfc4a7a2790f1d343c6ea246fc65ee (diff) | |
parent | 9ac58fd78e4f04f3807f18020124882ad68e3ffb (diff) | |
download | podman-02de8d576b531430f90ef2ab7a290c7fb59e9f3c.tar.gz podman-02de8d576b531430f90ef2ab7a290c7fb59e9f3c.tar.bz2 podman-02de8d576b531430f90ef2ab7a290c7fb59e9f3c.zip |
Merge pull request #5560 from QiWang19/remote_ceds
Use creds form PullImage remote
Diffstat (limited to 'pkg/adapter/runtime_remote.go')
-rw-r--r-- | pkg/adapter/runtime_remote.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go index d87de481c..fc396eddb 100644 --- a/pkg/adapter/runtime_remote.go +++ b/pkg/adapter/runtime_remote.go @@ -291,7 +291,8 @@ func (r *LocalRuntime) NewImageFromLocal(name string) (*ContainerImage, error) { // LoadFromArchiveReference creates an image from a local archive func (r *LocalRuntime) LoadFromArchiveReference(ctx context.Context, srcRef types.ImageReference, signaturePolicyPath string, writer io.Writer) ([]*ContainerImage, error) { var iid string - reply, err := iopodman.PullImage().Send(r.Conn, varlink.More, srcRef.DockerReference().String()) + creds := iopodman.AuthConfig{} + reply, err := iopodman.PullImage().Send(r.Conn, varlink.More, srcRef.DockerReference().String(), creds) if err != nil { return nil, err } @@ -323,7 +324,12 @@ func (r *LocalRuntime) New(ctx context.Context, name, signaturePolicyPath, authf if label != nil { return nil, errors.New("the remote client function does not support checking a remote image for a label") } - reply, err := iopodman.PullImage().Send(r.Conn, varlink.More, name) + creds := iopodman.AuthConfig{} + if dockeroptions.DockerRegistryCreds != nil { + creds.Username = dockeroptions.DockerRegistryCreds.Username + creds.Password = dockeroptions.DockerRegistryCreds.Password + } + reply, err := iopodman.PullImage().Send(r.Conn, varlink.More, name, creds) if err != nil { return nil, err } |