diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 15:44:02 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-03-29 11:43:32 -0400 |
| commit | 1089f83a40af084d4a3c0a03f2279ff3f58c2b4c (patch) | |
| tree | d573f7361fda5e816d73087ceadc26d64ecc5b62 /test/e2e/build/basicalpine | |
| parent | be02c8581cd2316bddc3007171f6057c63e95eb2 (diff) | |
| download | podman-1089f83a40af084d4a3c0a03f2279ff3f58c2b4c.tar.gz podman-1089f83a40af084d4a3c0a03f2279ff3f58c2b4c.tar.bz2 podman-1089f83a40af084d4a3c0a03f2279ff3f58c2b4c.zip | |
Fix podman build --pull-never
Currently pull policy is set incorrectly when users set --pull-never.
Also pull-policy is not being translated correctly when using
podman-remote.
Fixes: #9573
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
<MH: Fixed cherry-pick conflict>
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'test/e2e/build/basicalpine')
| -rw-r--r-- | test/e2e/build/basicalpine/Containerfile | 2 | ||||
| -rw-r--r-- | test/e2e/build/basicalpine/Containerfile.path | 2 | ||||
| -rw-r--r-- | test/e2e/build/basicalpine/Containerfile.volume | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/build/basicalpine/Containerfile b/test/e2e/build/basicalpine/Containerfile index 67fd37901..f6e07066c 100644 --- a/test/e2e/build/basicalpine/Containerfile +++ b/test/e2e/build/basicalpine/Containerfile @@ -1 +1 @@ -FROM alpine +FROM quay.io/libpod/alpine:latest diff --git a/test/e2e/build/basicalpine/Containerfile.path b/test/e2e/build/basicalpine/Containerfile.path index d2b03a6b8..a1349eb05 100644 --- a/test/e2e/build/basicalpine/Containerfile.path +++ b/test/e2e/build/basicalpine/Containerfile.path @@ -1,2 +1,2 @@ -FROM alpine +FROM quay.io/libpod/alpine:latest ENV PATH=/tmp:/bin:/usr/bin:/usr/sbin diff --git a/test/e2e/build/basicalpine/Containerfile.volume b/test/e2e/build/basicalpine/Containerfile.volume index 6a4fc8242..283d6376e 100644 --- a/test/e2e/build/basicalpine/Containerfile.volume +++ b/test/e2e/build/basicalpine/Containerfile.volume @@ -1,2 +1,2 @@ -FROM alpine +FROM quay.io/libpod/alpine:latest VOLUME "/volume0" |