Skip to content

Commit

Permalink
Change podman build --pull=true to PullIfMissing
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
TomSweeneyRedHat committed Nov 12, 2020
1 parent 2fc2d46 commit 6ea13fd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmd/podman/images/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/markdown/podman-build.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**

Expand Down

0 comments on commit 6ea13fd

Please sign in to comment.