diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-15 12:43:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 12:43:15 -0400 |
| commit | 463a5a7db5b096f225324d9c2c40e40a47f6e7c2 (patch) | |
| tree | 11829a61203fdc0304e9aacbebe0cf578e7d1933 /pkg/domain | |
| parent | 6b517a7e9077330bfe81d84401aa856e2fab380c (diff) | |
| parent | 3ddadc5326d6f7ba159495f135730ed817ce1989 (diff) | |
| download | podman-463a5a7db5b096f225324d9c2c40e40a47f6e7c2.tar.gz podman-463a5a7db5b096f225324d9c2c40e40a47f6e7c2.tar.bz2 podman-463a5a7db5b096f225324d9c2c40e40a47f6e7c2.zip | |
Merge pull request #10622 from cdoern/imgImportFeature
compat import imageFromSrc support for platform query parameter
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/images.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 3cc46ed0a..17b82037e 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -271,8 +271,10 @@ type ImageLoadReport struct { } type ImageImportOptions struct { + Architecture string Changes []string Message string + OS string Quiet bool Reference string SignaturePolicy string diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 083566201..5992181d3 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -388,6 +388,8 @@ func (ir *ImageEngine) Import(ctx context.Context, options entities.ImageImportO importOptions.CommitMessage = options.Message importOptions.Tag = options.Reference importOptions.SignaturePolicyPath = options.SignaturePolicy + importOptions.OS = options.OS + importOptions.Architecture = options.Architecture if !options.Quiet { importOptions.Writer = os.Stderr |