summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-21 07:36:56 -0700
committerGitHub <noreply@github.com>2019-03-21 07:36:56 -0700
commitf611f382d1eafaabd3b402afec210ca41422c469 (patch)
tree4469973446301c207dc3be92bb0e2f5a2c7e23c3
parenteeda995e78d5ee96b2a65cc1fd8f04d1eb627a19 (diff)
parenta220473698dfc8a74606690a4e28fcb0fa18babf (diff)
downloadpodman-f611f382d1eafaabd3b402afec210ca41422c469.tar.gz
podman-f611f382d1eafaabd3b402afec210ca41422c469.tar.bz2
podman-f611f382d1eafaabd3b402afec210ca41422c469.zip
Merge pull request #2541 from TomSweeneyRedHat/dev/tsweeney/docpull
Update pull and pull-always in bud man page
-rw-r--r--docs/podman-build.1.md14
1 files changed, 11 insertions, 3 deletions
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md
index 42fa9a359..ccc8bd900 100644
--- a/docs/podman-build.1.md
+++ b/docs/podman-build.1.md
@@ -288,13 +288,21 @@ process.
**--pull**
-Pull the image if it is not present. If this flag is disabled (with
-*--pull=false*) and the image is not present, the image will not be pulled.
+When the flag is enabled, attempt to pull the latest image from the registries
+listed in registries.conf if a local image does not exist or the image is newer
+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.
+
Defaults to *true*.
**--pull-always**
-Pull the image even if a version of the image is already present.
+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.
**--quiet, -q**