diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2018-07-28 07:26:14 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-01 18:22:59 +0000 |
| commit | 444142c7c10fb5068e1786bcef37599c78177fd1 (patch) | |
| tree | cdeac631c4d12c84a8bacdad9b59c7ea85bb600b /libpod/image/image.go | |
| parent | 1054b8d2c5b3d9b0dff2da82255fbe46480d2ba5 (diff) | |
| download | podman-444142c7c10fb5068e1786bcef37599c78177fd1.tar.gz podman-444142c7c10fb5068e1786bcef37599c78177fd1.tar.bz2 podman-444142c7c10fb5068e1786bcef37599c78177fd1.zip | |
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
Diffstat (limited to 'libpod/image/image.go')
| -rw-r--r-- | libpod/image/image.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 47a91cc7f..293f0b944 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -551,7 +551,7 @@ func (i *Image) PushImageToReference(ctx context.Context, dest types.ImageRefere if err != nil { 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 { imgRef := dest.DockerReference() 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 } 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) if err != nil { errors.Wrapf(err, "error getting image reference for %q", reference) |