From c450092fde60417e3a8f9d1a2d59a7ce2eff23e4 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Thu, 28 Jan 2021 17:53:05 +0100
Subject: 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>
---
test/system/070-build.bats | 23 -----------------------
1 file changed, 23 deletions(-)
(limited to 'test/system')
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"
--
cgit v1.2.3-54-g00ecf