diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 15:33:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 15:33:00 +0200 |
| commit | ef46687dc5bd3eff7b2e75a347f1b026c3b50f33 (patch) | |
| tree | d84ba00b5cc4661f1cba70f1f6ec1e3893a9fe30 /pkg | |
| parent | a5bce57218d7a3067e75028b237f92e0230969c3 (diff) | |
| parent | 2f3734b143a6f1d61e396ca221a211b7c487d081 (diff) | |
| download | podman-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 'pkg')
| -rw-r--r-- | pkg/domain/entities/manifest.go | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/manifest.go | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/manifest.go | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go index a9c961f9d..7316735b0 100644 --- a/pkg/domain/entities/manifest.go +++ b/pkg/domain/entities/manifest.go @@ -10,6 +10,7 @@ type ManifestAddOptions struct { Arch string `json:"arch" schema:"arch"` Features []string `json:"features" schema:"features"` Images []string `json:"images" schema:"images"` + OS string `json:"os" schema:"os"` OSVersion string `json:"os_version" schema:"os_version"` Variant string `json:"variant" schema:"variant"` } diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index 27d4bf9a5..88331f96c 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -79,6 +79,7 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd Arch: opts.Arch, Features: opts.Features, Images: opts.Images, + OS: opts.OS, OSVersion: opts.OSVersion, Variant: opts.Variant, } diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go index 338256530..18b400533 100644 --- a/pkg/domain/infra/tunnel/manifest.go +++ b/pkg/domain/infra/tunnel/manifest.go @@ -41,6 +41,7 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd Arch: opts.Arch, Features: opts.Features, Images: opts.Images, + OS: opts.OS, OSVersion: opts.OSVersion, Variant: opts.Variant, } |