diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2018-07-28 07:22:12 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-01 18:22:59 +0000 |
| commit | 1054b8d2c5b3d9b0dff2da82255fbe46480d2ba5 (patch) | |
| tree | c64286bfc699d996cf537fe592ead8b60200a45b /libpod/image/docker_registry_options.go | |
| parent | 2d5410d3496096ed2022a872b413a58ceee9fb98 (diff) | |
| download | podman-1054b8d2c5b3d9b0dff2da82255fbe46480d2ba5.tar.gz podman-1054b8d2c5b3d9b0dff2da82255fbe46480d2ba5.tar.bz2 podman-1054b8d2c5b3d9b0dff2da82255fbe46480d2ba5.zip | |
Add a *types.SystemContext parameter to getCopyOptions and DRO.GetSystemContext
All callers of getCopyOptions also call GetSystemContext with the same three parameters;
we will want to simplify this by passing the first SystemContext to getCopyOptions,
which can then inherit this data instead of so many parameters everywhere.
For now, just add a *types.SystemContext parameter without using it.
Should not change behavior (but does not add unit tests).
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Closes: #1176
Approved by: rhatdan
Diffstat (limited to 'libpod/image/docker_registry_options.go')
| -rw-r--r-- | libpod/image/docker_registry_options.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go index 838edf2d0..e6eea01dd 100644 --- a/libpod/image/docker_registry_options.go +++ b/libpod/image/docker_registry_options.go @@ -23,9 +23,9 @@ type DockerRegistryOptions struct { DockerInsecureSkipTLSVerify bool } -// GetSystemContext constructs a new system context from the given signaturePolicy path and the +// GetSystemContext constructs a new system context from a parent context, the given signaturePolicy path, and the // values in the DockerRegistryOptions -func (o DockerRegistryOptions) GetSystemContext(signaturePolicyPath, authFile string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext { +func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, signaturePolicyPath, authFile string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext { sc := &types.SystemContext{ SignaturePolicyPath: signaturePolicyPath, DockerAuthConfig: o.DockerRegistryCreds, |