opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 21:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the signaturePolicyPath parameter from getCopyOptions and DRO.GetSystemContext

Browse Source 
Use the parent types.SystemContext data instead.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Closes: #1176
Approved by: rhatdan
This commit is contained in:
Miloslav Trmač
2018-07-28 07:26:14 +02:00
committed by Atomic Bot
parent 1054b8d2c5
commit 444142c7c1
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/image/docker_registry_options.go
View File

@ -23,11 +23,9 @@ type DockerRegistryOptions struct {
DockerInsecureSkipTLSVerify bool DockerInsecureSkipTLSVerify bool
} }
// GetSystemContext constructs a new system context from a parent context, the given signaturePolicy path, and the // GetSystemContext constructs a new system context from a parent context. the values in the DockerRegistryOptions, and other parameters.
// values in the DockerRegistryOptions func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, authFile string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext {
func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, signaturePolicyPath, authFile string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *types.SystemContext {
sc := &types.SystemContext{ sc := &types.SystemContext{
SignaturePolicyPath: signaturePolicyPath,
DockerAuthConfig: o.DockerRegistryCreds, DockerAuthConfig: o.DockerRegistryCreds,
DockerCertPath: o.DockerCertPath, DockerCertPath: o.DockerCertPath,
DockerInsecureSkipTLSVerify: o.DockerInsecureSkipTLSVerify, DockerInsecureSkipTLSVerify: o.DockerInsecureSkipTLSVerify,
@ -35,6 +33,9 @@ func (o DockerRegistryOptions) GetSystemContext(parent *types.SystemContext, sig
DirForceCompress: forceCompress, DirForceCompress: forceCompress,
DockerArchiveAdditionalTags: additionalDockerArchiveTags, DockerArchiveAdditionalTags: additionalDockerArchiveTags,
} }
if parent != nil {
sc.SignaturePolicyPath = parent.SignaturePolicyPath
}
return sc return sc
} }

4
libpod/image/image.go
View File

@ -551,7 +551,7 @@ func (i *Image) PushImageToReference(ctx context.Context, dest types.ImageRefere
if err != nil { if err != nil {
return err return err
} }
copyOptions := getCopyOptions(sc, writer, signaturePolicyPath, nil, dockerRegistryOptions, signingOptions, authFile, manifestMIMEType, forceCompress, additionalDockerArchiveTags) copyOptions := getCopyOptions(sc, writer, nil, dockerRegistryOptions, signingOptions, authFile, manifestMIMEType, forceCompress, additionalDockerArchiveTags)
if dest.Transport().Name() == DockerTransport { if dest.Transport().Name() == DockerTransport {
imgRef := dest.DockerReference() imgRef := dest.DockerReference()
if imgRef == nil { // This should never happen; such references can’t be created. if imgRef == nil { // This should never happen; such references can’t be created.
@ -906,7 +906,7 @@ func (ir *Runtime) Import(ctx context.Context, path, reference string, writer io
return nil, err return nil, err
} }
defer policyContext.Destroy() defer policyContext.Destroy()
copyOptions := getCopyOptions(sc, writer, "", nil, nil, signingOptions, "", "", false, nil) copyOptions := getCopyOptions(sc, writer, nil, nil, signingOptions, "", "", false, nil)
dest, err := is.Transport.ParseStoreReference(ir.store, reference) dest, err := is.Transport.ParseStoreReference(ir.store, reference)
if err != nil { if err != nil {
errors.Wrapf(err, "error getting image reference for %q", reference) errors.Wrapf(err, "error getting image reference for %q", reference)

2
libpod/image/pull.go
View File

@ -232,7 +232,7 @@ func (ir *Runtime) pullImage(ctx context.Context, inputName string, writer io.Wr
} }
var images []string var images []string
for _, imageInfo := range goal.refPairs { for _, imageInfo := range goal.refPairs {
copyOptions := getCopyOptions(sc, writer, signaturePolicyPath, dockerOptions, nil, signingOptions, authfile, "", false, nil) copyOptions := getCopyOptions(sc, writer, dockerOptions, nil, signingOptions, authfile, "", false, nil)
if imageInfo.srcRef.Transport().Name() == DockerTransport { if imageInfo.srcRef.Transport().Name() == DockerTransport {
imgRef := imageInfo.srcRef.DockerReference() imgRef := imageInfo.srcRef.DockerReference()
if imgRef == nil { // This should never happen; such references can’t be created. if imgRef == nil { // This should never happen; such references can’t be created.

6
libpod/image/utils.go
View File

@ -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. // 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 { func getCopyOptions(sc *types.SystemContext, reportWriter io.Writer, srcDockerRegistry, destDockerRegistry *DockerRegistryOptions, signing SigningOptions, authFile, manifestType string, forceCompress bool, additionalDockerArchiveTags []reference.NamedTagged) *cp.Options {
if srcDockerRegistry == nil { if srcDockerRegistry == nil {
srcDockerRegistry = &DockerRegistryOptions{} srcDockerRegistry = &DockerRegistryOptions{}
} }
if destDockerRegistry == nil { if destDockerRegistry == nil {
destDockerRegistry = &DockerRegistryOptions{} destDockerRegistry = &DockerRegistryOptions{}
} }
srcContext := srcDockerRegistry.GetSystemContext(sc, signaturePolicyPath, authFile, forceCompress, additionalDockerArchiveTags) srcContext := srcDockerRegistry.GetSystemContext(sc, authFile, forceCompress, additionalDockerArchiveTags)
destContext := destDockerRegistry.GetSystemContext(sc, signaturePolicyPath, authFile, forceCompress, additionalDockerArchiveTags) destContext := destDockerRegistry.GetSystemContext(sc, authFile, forceCompress, additionalDockerArchiveTags)
return &cp.Options{ return &cp.Options{
RemoveSignatures: signing.RemoveSignatures, RemoveSignatures: signing.RemoveSignatures,
SignBy: signing.SignBy, SignBy: signing.SignBy,