diff options
| author | Qi Wang <qiwan@redhat.com> | 2020-09-13 15:40:41 -0400 |
|---|---|---|
| committer | Qi Wang <qiwan@redhat.com> | 2020-09-15 16:09:33 -0400 |
| commit | 2fcd1d7b4dca2619277607da7c8d22e9ec7620a2 (patch) | |
| tree | 27f44268555f587c724f9674c5ec742dbf31b089 /libpod/image | |
| parent | 0be5836e49da38b156951639b7e19eaec6a6e593 (diff) | |
| download | podman-2fcd1d7b4dca2619277607da7c8d22e9ec7620a2.tar.gz podman-2fcd1d7b4dca2619277607da7c8d22e9ec7620a2.tar.bz2 podman-2fcd1d7b4dca2619277607da7c8d22e9ec7620a2.zip | |
Supports import&run--signature-policy
Enables podman create, pull, run, import to use --signature-policy option. Set it as hidden flag to be consistent with other commands.
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/image.go | 2 | ||||
| -rw-r--r-- | libpod/image/pull.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 850a48eae..5dfb33afb 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -1284,7 +1284,7 @@ func (ir *Runtime) Import(ctx context.Context, path, reference string, writer io return nil, errors.Wrapf(err, "error updating image config") } - sc := GetSystemContext("", "", false) + sc := GetSystemContext(ir.SignaturePolicyPath, "", false) // if reference not given, get the image digest if reference == "" { diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 94d6af4c2..65acdf427 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -255,6 +255,9 @@ func (ir *Runtime) pullImageFromHeuristicSource(ctx context.Context, inputName s sc.ArchitectureChoice = dockerOptions.ArchitectureChoice sc.VariantChoice = dockerOptions.VariantChoice } + if signaturePolicyPath == "" { + sc.SignaturePolicyPath = ir.SignaturePolicyPath + } sc.BlobInfoCacheDir = filepath.Join(ir.store.GraphRoot(), "cache") srcRef, err := alltransports.ParseImageName(inputName) if err != nil { |