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/varlinkapi | |
| 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/varlinkapi')
| -rw-r--r-- | pkg/varlinkapi/images.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index c4809f16b..2dfb84e58 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -688,12 +688,18 @@ func (i *LibpodAPI) ExportImage(call iopodman.VarlinkCall, name, destination str } // PullImage pulls an image from a registry to the image store. -func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string) error { +func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string, creds iopodman.AuthConfig) error { var ( imageID string err error ) - dockerRegistryOptions := image.DockerRegistryOptions{} + dockerRegistryOptions := image.DockerRegistryOptions{ + DockerRegistryCreds: &types.DockerAuthConfig{ + Username: creds.Username, + Password: creds.Password, + }, + } + so := image.SigningOptions{} if call.WantsMore() { |