Merge pull request #15409 from vrothberg/fix-15300

[CI:DOCS] elaborate on image lookups of foreign platforms
This commit is contained in:
OpenShift Merge Robot
2022-08-22 13:24:59 -04:00
committed by GitHub
6 changed files with 16 additions and 6 deletions

View File

@ -1,2 +1,3 @@
#### **--arch**=*ARCH* #### **--arch**=*ARCH*
Override the architecture, defaults to hosts, of the image to be pulled. For example, `arm`. Override the architecture, defaults to hosts, of the image to be pulled. For example, `arm`.
Unless overridden, subsequent lookups of the same image in the local storage will match this architecture, regardless of the host.

View File

@ -2,3 +2,4 @@
Specify the platform for selecting the image. (Conflicts with --arch and --os) Specify the platform for selecting the image. (Conflicts with --arch and --os)
The `--platform` option can be used to override the current architecture and operating system. The `--platform` option can be used to override the current architecture and operating system.
Unless overridden, subsequent lookups of the same image in the local storage will match this platform, regardless of the host.

View File

@ -65,8 +65,9 @@ discarded when writing images in Docker formats.
Set the architecture of the image to be built, and that of the base image to be Set the architecture of the image to be built, and that of the base image to be
pulled, if the build uses one, to the provided value instead of using the pulled, if the build uses one, to the provided value instead of using the
architecture of the build host. (Examples: arm, arm64, 386, amd64, ppc64le, architecture of the build host. Unless overridden, subsequent lookups of the
s390x) same image in the local storage will match this architecture, regardless of the
host. (Examples: arm, arm64, 386, amd64, ppc64le, s390x)
@@option authfile @@option authfile
@ -451,7 +452,8 @@ do not include `History` information in their images.
Set the OS of the image to be built, and that of the base image to be pulled, Set the OS of the image to be built, and that of the base image to be pulled,
if the build uses one, instead of using the current operating system of the if the build uses one, instead of using the current operating system of the
build host. build host. Unless overridden, subsequent lookups of the same image in the
local storage will match this OS, regardless of the host.
#### **--os-feature**=*feature* #### **--os-feature**=*feature*
@ -503,9 +505,12 @@ process.
Set the *os/arch* of the built image (and its base image, if your build uses one) Set the *os/arch* of the built image (and its base image, if your build uses one)
to the provided value instead of using the current operating system and to the provided value instead of using the current operating system and
architecture of the host (for example `linux/arm`). If `--platform` is set, architecture of the host (for example `linux/arm`). Unless overridden,
then the values of the `--arch`, `--os`, and `--variant` options will be subsequent lookups of the same image in the local storage will match this
overridden. platform, regardless of the host.
If `--platform` is set, then the values of the `--arch`, `--os`, and
`--variant` options will be overridden.
The `--platform` option can be specified more than once, or given a The `--platform` option can be specified more than once, or given a
comma-separated list of values as its argument. When more than one platform is comma-separated list of values as its argument. When more than one platform is

View File

@ -452,6 +452,7 @@ This option conflicts with **--add-host**.
#### **--os**=*OS* #### **--os**=*OS*
Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`.
Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host.
@@option passwd-entry @@option passwd-entry

View File

@ -74,6 +74,7 @@ Print the usage statement.
#### **--os**=*OS* #### **--os**=*OS*
Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`.
Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host.
@@option platform @@option platform

View File

@ -465,6 +465,7 @@ This option conflicts with **--add-host**.
#### **--os**=*OS* #### **--os**=*OS*
Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`. Override the OS, defaults to hosts, of the image to be pulled. For example, `windows`.
Unless overridden, subsequent lookups of the same image in the local storage will match this OS, regardless of the host.
#### **--passwd** #### **--passwd**