Skip to content

Commit

Permalink
Merge pull request containers#8301 from TomSweeneyRedHat/dev/tsweeney…
Browse files Browse the repository at this point in the history
…/fixpully

Change podman build --pull=true to PullIfMissing
  • Loading branch information
openshift-merge-robot authored Nov 13, 2020
2 parents b2d281a + 6ea13fd commit 42a5b0f
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 42a5b0f

Please sign in to comment.