diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-11-10 19:45:36 -0500 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-11-12 18:50:31 -0500 |
| commit | 6ea13fd87282cbb564984fc09e22d099232bdd9c (patch) | |
| tree | 8ca00b8d41b1e994fd66a2fb88788d36639e3bb5 | |
| parent | 2fc2d4643ee699b8efc97f23850d5a37c4a85b89 (diff) | |
| download | podman-6ea13fd87282cbb564984fc09e22d099232bdd9c.tar.gz podman-6ea13fd87282cbb564984fc09e22d099232bdd9c.tar.bz2 podman-6ea13fd87282cbb564984fc09e22d099232bdd9c.zip | |
Change podman build --pull=true to PullIfMissing
One last tweak to the man page for 'build --pull' and after
further testing against Docker, one slight change to the
pull policy. First I changed `--pull=false` from PullNever
to PullIfMissing. This matches Docker and will pull the
image if it's not present rather than erroring. We've
the `--pull-never` option if someone wants the pull to
not do an actual pull and to error if the image isn't
local.
Then for the man page, I'd a much bigger change, in the
initial PR, I've backed most of that out and just
added a tweak.
Hopefully this puts this portion of the pull work behind
us for a while.
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
| -rw-r--r-- | cmd/podman/images/build.go | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman-build.1.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index f48d1cd94..5d0208c63 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -249,7 +249,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil } if flags.PullNever { - pullPolicy = imagebuildah.PullNever + pullPolicy = imagebuildah.PullIfMissing } args := make(map[string]string) diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index 4f11fe08e..130d3365e 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -438,9 +438,9 @@ 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. -If the option is disabled (with *--pull=false*), or not specified, pull the +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 -error if the image is not found in the registries. +error if the image is not found in the registries and is not present locally. #### **--pull-always** |