diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 15:44:02 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-27 05:33:30 -0400 |
| commit | 4d5199537737b0cfef47d3d2700013a787126d21 (patch) | |
| tree | 46da1fe2b2a51f437f592465e434c6487d17a1f8 /test/e2e/run_passwd_test.go | |
| parent | 4d0b583340c37efbf175c00d75d75107a0b23f00 (diff) | |
| download | podman-4d5199537737b0cfef47d3d2700013a787126d21.tar.gz podman-4d5199537737b0cfef47d3d2700013a787126d21.tar.bz2 podman-4d5199537737b0cfef47d3d2700013a787126d21.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>
Diffstat (limited to 'test/e2e/run_passwd_test.go')
| -rw-r--r-- | test/e2e/run_passwd_test.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index 12b6c64df..0d5dd5f3b 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -1,6 +1,7 @@ package integration import ( + "fmt" "os" . "github.com/containers/podman/v3/test/utils" @@ -60,9 +61,9 @@ var _ = Describe("Podman run passwd", func() { }) It("podman can run container without /etc/passwd", func() { - dockerfile := `FROM alpine + dockerfile := fmt.Sprintf(`FROM %s RUN rm -f /etc/passwd /etc/shadow /etc/group -USER 1000` +USER 1000`, ALPINE) imgName := "testimg" podmanTest.BuildImage(dockerfile, imgName, "false") session := podmanTest.Podman([]string{"run", "--rm", imgName, "ls", "/etc/"}) @@ -113,9 +114,9 @@ USER 1000` }) It("podman run numeric group from image and no group file", func() { - dockerfile := `FROM alpine + dockerfile := fmt.Sprintf(`FROM %s RUN rm -f /etc/passwd /etc/shadow /etc/group -USER 1000` +USER 1000`, ALPINE) imgName := "testimg" podmanTest.BuildImage(dockerfile, imgName, "false") session := podmanTest.Podman([]string{"run", "--rm", imgName, "ls", "/etc/"}) |