aboutsummaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-27 15:33:00 +0200
committerGitHub <noreply@github.com>2020-04-27 15:33:00 +0200
commitef46687dc5bd3eff7b2e75a347f1b026c3b50f33 (patch)
treed84ba00b5cc4661f1cba70f1f6ec1e3893a9fe30 /libpod
parenta5bce57218d7a3067e75028b237f92e0230969c3 (diff)
parent2f3734b143a6f1d61e396ca221a211b7c487d081 (diff)
downloadpodman-ef46687dc5bd3eff7b2e75a347f1b026c3b50f33.tar.gz
podman-ef46687dc5bd3eff7b2e75a347f1b026c3b50f33.tar.bz2
podman-ef46687dc5bd3eff7b2e75a347f1b026c3b50f33.zip
Merge pull request #5976 from QiWang19/manifest-add-os
Add --os to manifest add
Diffstat (limited to 'libpod')
-rw-r--r--libpod/image/manifests.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/image/manifests.go b/libpod/image/manifests.go
index 9dbeb4cc5..7ca17f86c 100644
--- a/libpod/image/manifests.go
+++ b/libpod/image/manifests.go
@@ -19,6 +19,7 @@ type ManifestAddOpts struct {
Arch string `json:"arch"`
Features []string `json:"features"`
Images []string `json:"images"`
+ OS string `json:"os"`
OSVersion string `json:"os_version"`
Variant string `json:"variant"`
}
@@ -86,6 +87,11 @@ func addManifestToList(ref types.ImageReference, list manifests.List, systemCont
if err != nil {
return nil, err
}
+ if opts.OS != "" {
+ if err := list.SetOS(d, opts.OS); err != nil {
+ return nil, err
+ }
+ }
if len(opts.OSVersion) > 0 {
if err := list.SetOSVersion(d, opts.OSVersion); err != nil {
return nil, err