diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-28 16:02:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:02:56 -0400 |
| commit | 97780a110b58a3bcc983bff75f3665768271631c (patch) | |
| tree | ba803042c50a294dd6bc1d6f3d75f1a2be5619a5 /cmd/podman/common | |
| parent | c069e0bad9f4aa8da98c46d702f450ce41da6346 (diff) | |
| parent | 3c6603a2f88ab5ba38bf58334417aaa90c458c06 (diff) | |
| download | podman-97780a110b58a3bcc983bff75f3665768271631c.tar.gz podman-97780a110b58a3bcc983bff75f3665768271631c.tar.bz2 podman-97780a110b58a3bcc983bff75f3665768271631c.zip | |
Merge pull request #7436 from rhatdan/variant
Add support for image pull overrides
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create.go | 7 | ||||
| -rw-r--r-- | cmd/podman/common/create_opts.go | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index d0bc8d466..2b6f9348e 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -323,13 +323,16 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "override-arch", "", "use `ARCH` instead of the architecture of the machine for choosing images", ) - // markFlagHidden(createFlags, "override-arch") createFlags.StringVar( &cf.OverrideOS, "override-os", "", "use `OS` instead of the running OS for choosing images", ) - // markFlagHidden(createFlags, "override-os") + createFlags.StringVar( + &cf.OverrideVariant, + "override-variant", "", + "Use _VARIANT_ instead of the running architecture variant for choosing images", + ) createFlags.String( "pid", "", "PID namespace to use", diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 16d41988f..1b0e64590 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -65,6 +65,7 @@ type ContainerCLIOpts struct { OOMScoreAdj int OverrideArch string OverrideOS string + OverrideVariant string PID string PIDsLimit *int64 Pod string |