summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-01-28 17:53:05 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-01-28 17:53:12 +0100
commitc450092fde60417e3a8f9d1a2d59a7ce2eff23e4 (patch)
treed0110e26fa5fb643eabb4f41a969709670a12e9e
parentfb653c43ed1eb9eb9b97ca80edb8df6caab88905 (diff)
downloadpodman-c450092fde60417e3a8f9d1a2d59a7ce2eff23e4.tar.gz
podman-c450092fde60417e3a8f9d1a2d59a7ce2eff23e4.tar.bz2
podman-c450092fde60417e3a8f9d1a2d59a7ce2eff23e4.zip
Revert "podman build --pull: use correct policy"
This reverts commit 15caebfe561952eaadd4896b7efb56f26724cce5. The previous behaviour of `--pull` to *always* attempt to pull the image and error out if the pull failed aligns with Docker. Since Podman aims at feature parity with Docker, the `--pull` behaviour must match. Fixes: #9134 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rw-r--r--cmd/podman/images/build.go2
-rw-r--r--test/system/070-build.bats23
2 files changed, 1 insertions, 24 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 957c0ac2d..4219e325b 100644
--- 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.PullIfNewer
+ pullPolicy = imagebuildah.PullAlways
}
if flags.PullAlways {
pullPolicy = imagebuildah.PullAlways
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"