summaryrefslogtreecommitdiff
path: root/pkg/domain
diff options
context:
space:
mode:
authorcdoern <cbdoer23@g.holycross.edu>2021-06-09 14:26:40 -0400
committercdoern <cbdoer23@g.holycross.edu>2021-06-14 09:05:01 -0400
commit3ddadc5326d6f7ba159495f135730ed817ce1989 (patch)
tree5bdb6d8ac975ad7667a164002562f36df74c5d6c /pkg/domain
parent2970e3518cc95910444903f572418f5887316e47 (diff)
downloadpodman-3ddadc5326d6f7ba159495f135730ed817ce1989.tar.gz
podman-3ddadc5326d6f7ba159495f135730ed817ce1989.tar.bz2
podman-3ddadc5326d6f7ba159495f135730ed817ce1989.zip
Image import fromSrc now supports OS/Arch
added handling in entities and compat to support passing a specified OS/Arch while importing from SRC. fixes #10566 Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
Diffstat (limited to 'pkg/domain')
-rw-r--r--pkg/domain/entities/images.go2
-rw-r--r--pkg/domain/infra/abi/images.go2
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