diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-28 11:39:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 11:39:56 -0800 |
| commit | d8f2333b29765d3407f90b062bfb40e43133d5e8 (patch) | |
| tree | 32654bc1142693fb50d0c462a814822aa3d08c72 | |
| parent | 8692467ad7250ebb270f90b368434e48ad74ed2f (diff) | |
| parent | d42b064c8cc3567e247d65d7f1dc207e2250394e (diff) | |
| download | podman-d8f2333b29765d3407f90b062bfb40e43133d5e8.tar.gz podman-d8f2333b29765d3407f90b062bfb40e43133d5e8.tar.bz2 podman-d8f2333b29765d3407f90b062bfb40e43133d5e8.zip | |
Merge pull request #4984 from baude/pullarchoverride
expose --arch-override option for pull
| -rw-r--r-- | cmd/podman/pull.go | 1 | ||||
| -rw-r--r-- | docs/source/markdown/podman-pull.1.md | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index c6baf6b61..1cbb3f45e 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -55,7 +55,6 @@ func init() { flags.StringVar(&pullCommand.Creds, "creds", "", "`Credentials` (USERNAME:PASSWORD) to use for authenticating to a registry") flags.BoolVarP(&pullCommand.Quiet, "quiet", "q", false, "Suppress output information when pulling images") flags.StringVar(&pullCommand.OverrideArch, "override-arch", "", "use `ARCH` instead of the architecture of the machine for choosing images") - markFlagHidden(flags, "override-arch") flags.StringVar(&pullCommand.OverrideOS, "override-os", "", "use `OS` instead of the running OS for choosing images") markFlagHidden(flags, "override-os") // Disabled flags for the remote client diff --git a/docs/source/markdown/podman-pull.1.md b/docs/source/markdown/podman-pull.1.md index de9688f5e..a22d2db42 100644 --- a/docs/source/markdown/podman-pull.1.md +++ b/docs/source/markdown/podman-pull.1.md @@ -69,6 +69,10 @@ The [username[:password]] to use to authenticate with the registry if required. If one or both values are not supplied, a command line prompt will appear and the value can be entered. The password is entered without echo. +**--override-arch**=ARCH + +Override the machine's default architecture of the image to be pulled. For example, `arm`. + **--quiet**, **-q** Suppress output information when pulling images @@ -134,6 +138,18 @@ Writing manifest to image destination Storing signatures 03290064078cb797f3e0a530e78c20c13dd22a3dd3adf84a5da2127b48df0438 ``` + +``` +$ podman pull --override-arch=arm arm32v7/debian:stretch +Trying to pull docker.io/arm32v7/debian:stretch... +Getting image source signatures +Copying blob b531ae4a3925 done +Copying config 3cba58dad5 done +Writing manifest to image destination +Storing signatures +3cba58dad5d9b35e755b48b634acb3fdd185ab1c996ac11510cc72c17780e13c +``` + ## FILES **registries.conf** (`/etc/containers/registries.conf`) |