Remove the signaturePolicyPath 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

1 files changed, 5 insertions, 4 deletions

diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
index e6eea01dd..34abdba45 100644
--- a/libpod/image/docker_registry_options.go
+++ b/libpod/image/docker_registry_options.go
@@ -23,11 +23,9 @@ type DockerRegistryOptions struct {
 	DockerInsecureSkipTLSVerify bool
 }
 
-// GetSystemContext constructs a new system context from a parent context, the given signaturePolicy path, and the
-// values in the DockerRegistryOptions
-func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, signaturePolicyPath, authFile string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext {
+// 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 {
 	sc := &types.SystemContext{
-		SignaturePolicyPath:         signaturePolicyPath,
 		DockerAuthConfig:            o.DockerRegistryCreds,
 		DockerCertPath:              o.DockerCertPath,
 		DockerInsecureSkipTLSVerify: o.DockerInsecureSkipTLSVerify,
@@ -35,6 +33,9 @@ func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, sig
 		DirForceCompress:            forceCompress,
 		DockerArchiveAdditionalTags: additionalDockerArchiveTags,
 	}
+	if parent != nil {
+		sc.SignaturePolicyPath = parent.SignaturePolicyPath
+	}
 	return sc
 }