Merge pull request #9144 from vrothberg/fix-9134

Revert "podman build --pull: use correct policy"

3 files changed, 5 insertions, 27 deletions

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 957c0ac2d..1f06dace9 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -106,7 +106,9 @@ func buildFlags(cmd *cobra.Command) {
 		logrus.Errorf("unable to set --pull to true: %v", err)
 	}
 	flag.DefValue = "true"
+	flag.Usage = "Always attempt to pull the image (errors are fatal)"
 	flags.AddFlagSet(&budFlags)
+
 	// Add the completion functions
 	budCompletions := buildahCLI.GetBudFlagsCompletions()
 	completion.CompleteCommandFlags(cmd, budCompletions)
@@ -266,7 +268,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 
 	pullPolicy := imagebuildah.PullIfMissing
 	if c.Flags().Changed("pull") && flags.Pull {
-		pullPolicy = imagebuildah.PullIfNewer
+		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 61c05fdef..e05678e2c 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -455,9 +455,8 @@ not required for Buildah as it supports only Linux.
 
 #### **--pull**
 
-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.
+When the option is specified or set to "true", pull the image.  Raise an error
+if the image could not be pulled, even if the image is present locally.
 
 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
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 6b5bc68fb..7a42a4c18 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -29,29 +29,6 @@ EOF
     run_podman rmi -f build_test
 }
 
-@test "podman build - basic test with --pull" {
-    rand_filename=$(random_string 20)
-    rand_content=$(random_string 50)
-
-    run_podman tag $IMAGE localhost/localonly
-
-    tmpdir=$PODMAN_TMPDIR/build-test
-    mkdir -p $tmpdir
-    dockerfile=$tmpdir/Dockerfile
-    cat >$dockerfile <<EOF
-FROM localhost/localonly
-RUN echo $rand_content > /$rand_filename
-EOF
-    # With --pull, Podman would try to pull a newer image but use the local one
-    # if present. See #9111.
-    run_podman build --pull -t build_test $tmpdir
-
-    run_podman run --rm build_test cat /$rand_filename
-    is "$output"   "$rand_content"   "reading generated file in image"
-
-    run_podman rmi -f build_test localhost/localonly
-}
-
 @test "podman build - global runtime flags test" {
     skip_if_remote "--runtime-flag flag not supported for remote"