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_volume_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_volume_test.go')
| -rw-r--r-- | test/e2e/run_volume_test.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index 85a4d6d52..9b77aaef8 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -308,9 +308,9 @@ var _ = Describe("Podman run with volumes", func() { It("podman named volume copyup symlink", func() { imgName := "testimg" - dockerfile := `FROM alpine + dockerfile := fmt.Sprintf(`FROM %s RUN touch /testfile -RUN sh -c "cd /etc/apk && ln -s ../../testfile"` +RUN sh -c "cd /etc/apk && ln -s ../../testfile"`, ALPINE) podmanTest.BuildImage(dockerfile, imgName, "false") baselineSession := podmanTest.Podman([]string{"run", "--rm", "-t", "-i", imgName, "ls", "/etc/apk/"}) @@ -479,9 +479,8 @@ RUN sh -c "cd /etc/apk && ln -s ../../testfile"` It("Podman mount over image volume with trailing /", func() { image := "podman-volume-test:trailing" - dockerfile := ` -FROM alpine:latest -VOLUME /test/` + dockerfile := fmt.Sprintf(`FROM %s +VOLUME /test/`, ALPINE) podmanTest.BuildImage(dockerfile, image, "false") ctrName := "testCtr" @@ -646,9 +645,9 @@ VOLUME /test/` It("volume permissions after run", func() { imgName := "testimg" - dockerfile := `FROM fedora-minimal + dockerfile := fmt.Sprintf(`FROM %s RUN useradd -m testuser -u 1005 -USER testuser` +USER testuser`, fedoraMinimal) podmanTest.BuildImage(dockerfile, imgName, "false") testString := "testuser testuser" |