Merge pull request #9127 from vrothberg/fix-9111

podman build --pull: use correct policy
containers · Jan 27, 2021 · 14cc4aa · 14cc4aa
2 parents 1814fa2 + 15caebf
commit 14cc4aa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
@@ -266,7 +266,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 
 	pullPolicy := imagebuildah.PullIfMissing
 	if c.Flags().Changed("pull") && flags.Pull {
-		pullPolicy = imagebuildah.PullAlways
+		pullPolicy = imagebuildah.PullIfNewer
 	}
 	if flags.PullAlways {
 		pullPolicy = imagebuildah.PullAlways

diff --git a/test/system/070-build.bats b/test/system/070-build.bats
@@ -29,6 +29,29 @@ 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"