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/utils.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/utils.go')
| -rw-r--r-- | libpod/image/utils.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/image/utils.go b/libpod/image/utils.go index 27c386efd..a4b4efd2f 100644 --- a/libpod/image/utils.go +++ b/libpod/image/utils.go @@ -43,15 +43,15 @@ func findImageInRepotags(search imageParts, images []*Image) (*storage.Image, er } // getCopyOptions constructs a new containers/image/copy.Options{} struct from the given parameters, inheriting some from sc. -func getCopyOptions(sc *types.SystemContext, reportWriter io.Writer, srcDockerRegistry, destDockerRegistry *DockerRegistryOptions, signing SigningOptions, authFile, manifestType string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *cp.Options { +func getCopyOptions(sc *types.SystemContext, reportWriter io.Writer, srcDockerRegistry, destDockerRegistry *DockerRegistryOptions, signing SigningOptions, manifestType string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *cp.Options { if srcDockerRegistry == nil { srcDockerRegistry = &DockerRegistryOptions{} } if destDockerRegistry == nil { destDockerRegistry = &DockerRegistryOptions{} } - srcContext := srcDockerRegistry.GetSystemContext(sc, authFile, forceCompress, additionalDockerArchiveTags) - destContext := destDockerRegistry.GetSystemContext(sc, authFile, forceCompress, additionalDockerArchiveTags) + srcContext := srcDockerRegistry.GetSystemContext(sc, forceCompress, additionalDockerArchiveTags) + destContext := destDockerRegistry.GetSystemContext(sc, forceCompress, additionalDockerArchiveTags) return &cp.Options{ RemoveSignatures: signing.RemoveSignatures, SignBy: signing.SignBy, |