diff options
author | Miloslav Trmač <mitr@redhat.com> | 2018-07-28 07:33:01 +0200 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-01 18:22:59 +0000 |
commit | b63b84ea5e06393d997254e17372f6af8ab8bcac (patch) | |
tree | b9cdbe501ee81154bbb9613792aa337114e93cce /libpod/image/docker_registry_options.go | |
parent | 444142c7c10fb5068e1786bcef37599c78177fd1 (diff) | |
download | podman-b63b84ea5e06393d997254e17372f6af8ab8bcac.tar.gz podman-b63b84ea5e06393d997254e17372f6af8ab8bcac.tar.bz2 podman-b63b84ea5e06393d997254e17372f6af8ab8bcac.zip |
Remove the authFile parameter from getCopyOptions and DRO.GetSystemContext
Use the parent types.SystemContext data instead.
Should not change behavior.
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 34abdba45..484f3a997 100644 --- a/libpod/image/docker_registry_options.go +++ b/libpod/image/docker_registry_options.go @@ -24,17 +24,17 @@ type DockerRegistryOptions struct { } // GetSystemContext constructs a new system context from a parent context. the values in the DockerRegistryOptions, and other parameters. -func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, authFile string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext { +func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext { sc := &types.SystemContext{ DockerAuthConfig: o.DockerRegistryCreds, DockerCertPath: o.DockerCertPath, DockerInsecureSkipTLSVerify: o.DockerInsecureSkipTLSVerify, - AuthFilePath: authFile, DirForceCompress: forceCompress, DockerArchiveAdditionalTags: additionalDockerArchiveTags, } if parent != nil { sc.SignaturePolicyPath = parent.SignaturePolicyPath + sc.AuthFilePath = parent.AuthFilePath } return sc } |