diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-13 20:19:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-13 20:19:54 +0100 |
commit | 225f22b9d5dfd0d1582a56530142fe8ffb960a91 (patch) | |
tree | 4dcc994bb1e48602e5be5f42b7599abdc0cc7937 /docs/source | |
parent | 15220af08ce2346686e54851a6d498ec573e950c (diff) | |
parent | 6003033adae775f1d725b05231a246a4462ae669 (diff) | |
download | podman-225f22b9d5dfd0d1582a56530142fe8ffb960a91.tar.gz podman-225f22b9d5dfd0d1582a56530142fe8ffb960a91.tar.bz2 podman-225f22b9d5dfd0d1582a56530142fe8ffb960a91.zip |
Merge pull request #4506 from TomSweeneyRedHat/dev/tsweeney/bump_buildah1.11.5
Bump to Buildah v1.11.5
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/markdown/podman-build.1.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index 567d0ead3..6c8f239a6 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -342,8 +342,8 @@ than the one in storage. Raise an error if the image is not in any listed registry and is not present locally. If the flag is disabled (with *--pull=false*), do not pull the image from the -registry, use only the local version. Raise an error if the image is not -present locally. +registry, unless there is no local image. Raise an error if the image is not +in any registry and is not present locally. Defaults to *true*. @@ -352,6 +352,11 @@ Defaults to *true*. Pull the image from the first registry it is found in as listed in registries.conf. Raise an error if not found in the registries, even if the image is present locally. +**--pull-never** + +Do not pull the image from the registry, use only the local version. Raise an error +if the image is not present locally. + **--quiet**, **-q** Suppress output messages which indicate which instruction is being processed, |