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