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/exec_test.go | |
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/exec_test.go')
-rw-r--r-- | test/e2e/exec_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 2ffb5cd2e..df86eab15 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -475,10 +475,10 @@ var _ = Describe("Podman exec", func() { }) It("podman exec preserves container groups with --user and --group-add", func() { - dockerfile := `FROM registry.fedoraproject.org/fedora-minimal + dockerfile := fmt.Sprintf(`FROM %s RUN groupadd -g 4000 first RUN groupadd -g 4001 second -RUN useradd -u 1000 auser` +RUN useradd -u 1000 auser`, fedoraMinimal) imgName := "testimg" podmanTest.BuildImage(dockerfile, imgName, "false") |