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/runlabel_test.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/e2e/runlabel_test.go')

diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go
index 2eec15c62..54fa7e2f6 100644
--- a/test/e2e/runlabel_test.go
+++ b/test/e2e/runlabel_test.go
@@ -1,6 +1,7 @@
 package integration
 
 import (
+	"fmt"
 	"os"
 
 	. "github.com/containers/podman/v3/test/utils"
@@ -8,18 +9,17 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var PodmanDockerfile = `
-FROM  alpine:latest
-LABEL RUN podman --version`
+var PodmanDockerfile = fmt.Sprintf(`
+FROM  %s
+LABEL RUN podman --version`, ALPINE)
 
-var LsDockerfile = `
-FROM  alpine:latest
-LABEL RUN ls -la`
+var LsDockerfile = fmt.Sprintf(`
+FROM  %s
+LABEL RUN ls -la`, ALPINE)
 
-var GlobalDockerfile = `
-FROM alpine:latest
-LABEL RUN echo \$GLOBAL_OPTS
-`
+var GlobalDockerfile = fmt.Sprintf(`
+FROM %s
+LABEL RUN echo \$GLOBAL_OPTS`, ALPINE)
 
 var _ = Describe("podman container runlabel", func() {
 	var (
-- 
cgit v1.2.3-54-g00ecf