diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-01-28 18:00:22 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-01-28 18:00:22 +0100 |
| commit | c0bf0ba9e5bfa3df343dd3364c0ee2d8c737ae59 (patch) | |
| tree | 663add1d094fb8fcefc685ed2a641e068d507f65 | |
| parent | c450092fde60417e3a8f9d1a2d59a7ce2eff23e4 (diff) | |
| download | podman-c0bf0ba9e5bfa3df343dd3364c0ee2d8c737ae59.tar.gz podman-c0bf0ba9e5bfa3df343dd3364c0ee2d8c737ae59.tar.bz2 podman-c0bf0ba9e5bfa3df343dd3364c0ee2d8c737ae59.zip | |
podman build --pull: refine help message and docs
Refine and correct the wording of the `--pull` flag in the help message
and the docs.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| -rw-r--r-- | cmd/podman/images/build.go | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman-build.1.md | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 4219e325b..1f06dace9 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -106,7 +106,9 @@ func buildFlags(cmd *cobra.Command) { logrus.Errorf("unable to set --pull to true: %v", err) } flag.DefValue = "true" + flag.Usage = "Always attempt to pull the image (errors are fatal)" flags.AddFlagSet(&budFlags) + // Add the completion functions budCompletions := buildahCLI.GetBudFlagsCompletions() completion.CompleteCommandFlags(cmd, budCompletions) diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index 61c05fdef..e05678e2c 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -455,9 +455,8 @@ not required for Buildah as it supports only Linux. #### **--pull** -When the option is specified or set 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. +When the option is specified or set to "true", pull the image. Raise an error +if the image could not be pulled, even if the image is present locally. If the option is disabled (with *--pull=false*) or not specified, pull the image from the registry only if the image is not present locally. Raise an |