diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-28 07:06:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 07:06:31 -0700 |
| commit | e7a2eecf5f3975edfb92cd2cacff0d34ef45f808 (patch) | |
| tree | 5557aaeb6ec27d61b75b1db18dc5e0a4d85c90be /pkg/varlinkapi/images.go | |
| parent | 850326cc192444d1c5cfd8ba6e1015f653b41e73 (diff) | |
| parent | 179a66f1a0a22be66c0346afa8ea3181d5846fb2 (diff) | |
| download | podman-e7a2eecf5f3975edfb92cd2cacff0d34ef45f808.tar.gz podman-e7a2eecf5f3975edfb92cd2cacff0d34ef45f808.tar.bz2 podman-e7a2eecf5f3975edfb92cd2cacff0d34ef45f808.zip | |
Merge pull request #2760 from mheon/misc_small_changes
Remove ulele/deepcopier in favor of JSON deep copy
Diffstat (limited to 'pkg/varlinkapi/images.go')
| -rw-r--r-- | pkg/varlinkapi/images.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 210f139ce..23ea24a7a 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -514,7 +514,11 @@ func (i *LibpodAPI) Commit(call iopodman.VarlinkCall, name, imageName string, ch if err != nil { return call.ReplyContainerNotFound(name, err.Error()) } - sc := image.GetSystemContext(i.Runtime.GetConfig().SignaturePolicyPath, "", false) + rtc, err := i.Runtime.GetConfig() + if err != nil { + return call.ReplyErrorOccurred(err.Error()) + } + sc := image.GetSystemContext(rtc.SignaturePolicyPath, "", false) var mimeType string switch manifestType { case "oci", "": //nolint @@ -525,7 +529,7 @@ func (i *LibpodAPI) Commit(call iopodman.VarlinkCall, name, imageName string, ch return call.ReplyErrorOccurred(fmt.Sprintf("unrecognized image format %q", manifestType)) } coptions := buildah.CommitOptions{ - SignaturePolicyPath: i.Runtime.GetConfig().SignaturePolicyPath, + SignaturePolicyPath: rtc.SignaturePolicyPath, ReportWriter: nil, SystemContext: sc, PreferredManifestType: mimeType, |