diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2021-01-25 09:41:55 -0500 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-01-25 14:58:24 -0500 |
commit | 5623cb9d3d722a7015a395b31ce9ee7d9954bed9 (patch) | |
tree | 3d60e8ff3f29902dc082ec0ecce1a5a52c804579 /pkg/domain/entities/images.go | |
parent | 23b879d72f9e2cf2b2d3924399605e0edebaa977 (diff) | |
download | podman-5623cb9d3d722a7015a395b31ce9ee7d9954bed9.tar.gz podman-5623cb9d3d722a7015a395b31ce9ee7d9954bed9.tar.bz2 podman-5623cb9d3d722a7015a395b31ce9ee7d9954bed9.zip |
Fix --arch and --os flags to work correctly
Currently podman implements --override-arch and --overide-os
But Podman has made these aliases for --arch and --os. No
reason to have to specify --override, since it is clear what
the user intends.
Currently if the user specifies an --override-arch field but the
image was previously pulled for a different Arch, podman run uses
the different arch. This PR also fixes this issue.
Fixes: https://github.com/containers/podman/issues/8001
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/domain/entities/images.go')
-rw-r--r-- | pkg/domain/entities/images.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 78a7d8aa7..ef40d5490 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -133,13 +133,13 @@ type ImagePullOptions struct { Username string // Password for authenticating against the registry. Password string - // OverrideArch will overwrite the local architecture for image pulls. - OverrideArch string - // OverrideOS will overwrite the local operating system (OS) for image + // Arch will overwrite the local architecture for image pulls. + Arch string + // OS will overwrite the local operating system (OS) for image // pulls. - OverrideOS string - // OverrideVariant will overwrite the local variant for image pulls. - OverrideVariant string + OS string + // Variant will overwrite the local variant for image pulls. + Variant string // Quiet can be specified to suppress pull progress when pulling. Ignored // for remote calls. Quiet bool |