diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-13 10:42:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 10:42:13 +0100 |
| commit | 42a5b0fd93c8a19433be814273e9ac80e53d7bbe (patch) | |
| tree | 3aeddd3f573261f0571d7cdacbea04e968db42ee | |
| parent | b2d281afcc36a54bc168c3d1c16416e06966c4b3 (diff) | |
| parent | 6ea13fd87282cbb564984fc09e22d099232bdd9c (diff) | |
| download | podman-42a5b0fd93c8a19433be814273e9ac80e53d7bbe.tar.gz podman-42a5b0fd93c8a19433be814273e9ac80e53d7bbe.tar.bz2 podman-42a5b0fd93c8a19433be814273e9ac80e53d7bbe.zip | |
Merge pull request #8301 from TomSweeneyRedHat/dev/tsweeney/fixpully
Change podman build --pull=true to PullIfMissing
| -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** |