From 57d665ee9c9a42a9ca6f55b0492343af194aad78 Mon Sep 17 00:00:00 2001 From: James Addison Date: Sat, 9 Oct 2021 15:43:09 +0100 Subject: [PATCH 1/2] docs: update buildah-build 'platform' option compatibility notes Signed-off-by: James Addison --- docs/buildah-build.1.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/buildah-build.1.md b/docs/buildah-build.1.md index 552737ca93..3b9d95f6c7 100644 --- a/docs/buildah-build.1.md +++ b/docs/buildah-build.1.md @@ -419,9 +419,7 @@ process. 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 -architecture of the host (for example `linux/arm`). If `--platform` is set, -then the values of the `--arch`, `--os`, and `--variant` options will be -overridden. +architecture of the host (for example `linux/arm`). The `--platform` flag can be specified more than once, or given a comma-separated list of values as its argument. When more than one platform is @@ -438,6 +436,8 @@ While `buildah bud` is happy to use base images and build images for any platform that exists, `RUN` instructions will not be able to succeed without the help of emulation provided by packages like `qemu-user-static`. +**NOTE:** The `--platform` option may not be used in combination with the `--arch`, `--os`, or `--variant` options. + **--pull** When the flag is enabled, attempt to pull the latest image from the registries From f795888c56cd7bca2f61c5dccef0695ad7e49526 Mon Sep 17 00:00:00 2001 From: James Addison Date: Sun, 10 Oct 2021 17:26:45 +0100 Subject: [PATCH 2/2] docs: update buildah-from, buildah-pull 'platform' option compatibility notes Signed-off-by: James Addison --- docs/buildah-from.1.md | 6 +++--- docs/buildah-pull.1.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/buildah-from.1.md b/docs/buildah-from.1.md index d3c1e6fbd7..d4ece34267 100644 --- a/docs/buildah-from.1.md +++ b/docs/buildah-from.1.md @@ -299,9 +299,7 @@ process. Set the OS/ARCH of the image to be pulled to the provided value instead of using the current operating system and -architecture of the host (for example `linux/arm`). If `--platform` -is set, then the values of the `--arch`, `--os`, and `--variant` options will -be overridden. +architecture of the host (for example `linux/arm`). OS/ARCH pairs are those used by the Go Programming Language. In several cases the ARCH value for a platform differs from one produced by other tools such as @@ -313,6 +311,8 @@ While `buildah from` is happy to pull an image for any platform that exists, `buildah run` will not be able to run binaries provided by that image without the help of emulation provided by packages like `qemu-user-static`. +**NOTE:** The `--platform` option may not be used in combination with the `--arch`, `--os`, or `--variant` options. + **--pull** When the flag is enabled, attempt to pull the latest image from the registries diff --git a/docs/buildah-pull.1.md b/docs/buildah-pull.1.md index 015ddae9ac..dfb1f25d1b 100644 --- a/docs/buildah-pull.1.md +++ b/docs/buildah-pull.1.md @@ -64,9 +64,7 @@ Set the OS of the image to be pulled instead of using the current operating syst Set the OS/ARCH of the image to be pulled to the provided value instead of using the current operating system and -architecture of the host (for example `linux/arm`). If `--platform` -is set, then the values of the `--arch`, `--os`, and `--variant` options will -be overridden. +architecture of the host (for example `linux/arm`). OS/ARCH pairs are those used by the Go Programming Language. In several cases the ARCH value for a platform differs from one produced by other tools such as @@ -74,6 +72,8 @@ the `arch` command. Valid OS and architecture name combinations are listed as values for $GOOS and $GOARCH at https://golang.org/doc/install/source#environment, and can also be found by running `go tool dist list`. +**NOTE:** The `--platform` option may not be used in combination with the `--arch`, `--os`, or `--variant` options. + **--policy**=**always**|**missing**|**never** Pull image policy. The default is **missing**.