diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-02 15:34:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 15:34:20 +0100 |
| commit | 8bc0f51e330185bed1be4bcfffd04729b4bc9cd4 (patch) | |
| tree | 7784bde1934328c78bcbc47ac83fc9ce3ddfc2b5 | |
| parent | c1ffdfbd7883d45f864c74a4a07cf9ff80b4018f (diff) | |
| parent | 7841aea292e1dc7cc9c28dfb5f4e935116fb4dfe (diff) | |
| download | podman-8bc0f51e330185bed1be4bcfffd04729b4bc9cd4.tar.gz podman-8bc0f51e330185bed1be4bcfffd04729b4bc9cd4.tar.bz2 podman-8bc0f51e330185bed1be4bcfffd04729b4bc9cd4.zip | |
Merge pull request #8210 from TomSweeneyRedHat/dev/tsweeney/fixpull2
Match build pull functionality with Docker's
| -rw-r--r-- | cmd/podman/images/build.go | 10 | ||||
| -rw-r--r-- | docs/source/markdown/podman-build.1.md | 15 |
2 files changed, 9 insertions, 16 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 0ff482cd9..f48d1cd94 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -240,13 +240,9 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil } } - pullPolicy := imagebuildah.PullIfNewer - if c.Flags().Changed("pull") { - if flags.Pull { - pullPolicy = imagebuildah.PullAlways - } else { - pullPolicy = imagebuildah.PullNever - } + pullPolicy := imagebuildah.PullIfMissing + if c.Flags().Changed("pull") && flags.Pull { + pullPolicy = imagebuildah.PullAlways } if flags.PullAlways { pullPolicy = imagebuildah.PullAlways diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index f1fddb2fc..1e1e1d27e 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -384,16 +384,13 @@ not required for Buildah as it supports only Linux. **--pull** -When the flag is enabled, attempt to pull the latest image from the registries -listed in registries.conf if a local image does not exist or the image is newer -than the one in storage. Raise an error if the image is not in any listed -registry and is not present locally. +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 flag is disabled (with *--pull=false*), do not pull the image from the -registry, unless there is no local image. Raise an error if the image is not -in any registry and is not present locally. - -Defaults to *true*. +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. **--pull-always** |