summaryrefslogtreecommitdiff
path: root/libpod/image/docker_registry_options.go
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2018-07-28 07:34:46 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-01 18:22:59 +0000
commit7f5efd8d0436e3f094ddeef02d3489c395c9e0eb (patch)
tree7bfb5bc3225b9bc9db5616a91d82638406e3b89c /libpod/image/docker_registry_options.go
parentb63b84ea5e06393d997254e17372f6af8ab8bcac (diff)
downloadpodman-7f5efd8d0436e3f094ddeef02d3489c395c9e0eb.tar.gz
podman-7f5efd8d0436e3f094ddeef02d3489c395c9e0eb.tar.bz2
podman-7f5efd8d0436e3f094ddeef02d3489c395c9e0eb.zip
Remove the forceCompress 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.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
index 484f3a997..97a151396 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, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext {
+func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext {
sc := &types.SystemContext{
DockerAuthConfig: o.DockerRegistryCreds,
DockerCertPath: o.DockerCertPath,
DockerInsecureSkipTLSVerify: o.DockerInsecureSkipTLSVerify,
- DirForceCompress: forceCompress,
DockerArchiveAdditionalTags: additionalDockerArchiveTags,
}
if parent != nil {
sc.SignaturePolicyPath = parent.SignaturePolicyPath
sc.AuthFilePath = parent.AuthFilePath
+ sc.DirForceCompress = parent.DirForceCompress
}
return sc
}