From 1089f83a40af084d4a3c0a03f2279ff3f58c2b4c Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri, 26 Mar 2021 15:44:02 -0400
Subject: 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>
---
 test/e2e/build/squash/Dockerfile.squash-c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/e2e/build/squash/Dockerfile.squash-c')

diff --git a/test/e2e/build/squash/Dockerfile.squash-c b/test/e2e/build/squash/Dockerfile.squash-c
index df9c90388..63bf84e69 100644
--- a/test/e2e/build/squash/Dockerfile.squash-c
+++ b/test/e2e/build/squash/Dockerfile.squash-c
@@ -1,3 +1,3 @@
-FROM busybox:latest
+FROM quay.io/libpod/busybox:latest
 ADD alpinetest.tgz /data
 RUN rm -rf /data
-- 
cgit v1.2.3-54-g00ecf