diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-16 11:05:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 11:05:33 +0200 |
| commit | 0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6 (patch) | |
| tree | bbb75dd846015cb33e2a96b1ea9a6c4ec0d62859 /pkg/domain | |
| parent | b9c47fa40bc503e155a528174974293c6b053ec2 (diff) | |
| parent | 2fcd1d7b4dca2619277607da7c8d22e9ec7620a2 (diff) | |
| download | podman-0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6.tar.gz podman-0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6.tar.bz2 podman-0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6.zip | |
Merge pull request #7624 from QiWang19/policy-option
Supports import&run--signature-policy
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/images.go | 13 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 2a8133680..3a2e762d6 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -259,12 +259,13 @@ type ImageLoadReport struct { } type ImageImportOptions struct { - Changes []string - Message string - Quiet bool - Reference string - Source string - SourceIsURL bool + Changes []string + Message string + Quiet bool + Reference string + SignaturePolicy string + Source string + SourceIsURL bool } type ImageImportReport struct { diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index cc3ec37fb..cc62c3f27 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -467,7 +467,7 @@ func (ir *ImageEngine) Load(ctx context.Context, opts entities.ImageLoadOptions) } func (ir *ImageEngine) Import(ctx context.Context, opts entities.ImageImportOptions) (*entities.ImageImportReport, error) { - id, err := ir.Libpod.Import(ctx, opts.Source, opts.Reference, opts.Changes, opts.Message, opts.Quiet) + id, err := ir.Libpod.Import(ctx, opts.Source, opts.Reference, opts.SignaturePolicy, opts.Changes, opts.Message, opts.Quiet) if err != nil { return nil, err } |