diff options
author | Miloslav Trmač <mitr@redhat.com> | 2018-12-03 21:32:13 +0100 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2018-12-06 23:31:54 +0100 |
commit | 6a0afce7c8ddfb9d70467da17b7f820a5aba5c56 (patch) | |
tree | 0d474e2765a798418c432fd9fd34008cdb76ec94 /libpod/common/common.go | |
parent | d3be6b8578fdae87f714ebcac6cb62c7b940f506 (diff) | |
download | podman-6a0afce7c8ddfb9d70467da17b7f820a5aba5c56.tar.gz podman-6a0afce7c8ddfb9d70467da17b7f820a5aba5c56.tar.bz2 podman-6a0afce7c8ddfb9d70467da17b7f820a5aba5c56.zip |
Remove some unused data structures and code
... instead of unnecessarily adapting it for the DockerInsecureSkipTLSVerify type change.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'libpod/common/common.go')
-rw-r--r-- | libpod/common/common.go | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/libpod/common/common.go b/libpod/common/common.go index 932f1f6da..5d10bee36 100644 --- a/libpod/common/common.go +++ b/libpod/common/common.go @@ -1,32 +1,9 @@ package common import ( - "io" - - cp "github.com/containers/image/copy" "github.com/containers/image/types" ) -// 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) *cp.Options { - if srcDockerRegistry == nil { - srcDockerRegistry = &DockerRegistryOptions{} - } - if destDockerRegistry == nil { - destDockerRegistry = &DockerRegistryOptions{} - } - srcContext := srcDockerRegistry.GetSystemContext(signaturePolicyPath, authFile, forceCompress) - destContext := destDockerRegistry.GetSystemContext(signaturePolicyPath, authFile, forceCompress) - return &cp.Options{ - RemoveSignatures: signing.RemoveSignatures, - SignBy: signing.SignBy, - ReportWriter: reportWriter, - SourceCtx: srcContext, - DestinationCtx: destContext, - ForceManifestMIMEType: manifestType, - } -} - // GetSystemContext Constructs a new containers/image/types.SystemContext{} struct from the given signaturePolicy path func GetSystemContext(signaturePolicyPath, authFilePath string, forceCompress bool) *types.SystemContext { sc := &types.SystemContext{} |