opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 18:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Valentin Rothberg
2021-01-28 17:53:05 +01:00
parent fb653c43ed
commit c450092fde
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/images/build.go
View File

@ -266,7 +266,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
pullPolicy := imagebuildah.PullIfMissing pullPolicy := imagebuildah.PullIfMissing
if c.Flags().Changed("pull") && flags.Pull { if c.Flags().Changed("pull") && flags.Pull {
pullPolicy = imagebuildah.PullIfNewer pullPolicy = imagebuildah.PullAlways
} }
if flags.PullAlways { if flags.PullAlways {
pullPolicy = imagebuildah.PullAlways pullPolicy = imagebuildah.PullAlways

23
test/system/070-build.bats
View File

@ -29,29 +29,6 @@ EOF
run_podman rmi -f build_test 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" { @test "podman build - global runtime flags test" {
skip_if_remote "--runtime-flag flag not supported for remote" skip_if_remote "--runtime-flag flag not supported for remote"