diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-29 13:41:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 13:41:42 +0000 |
| commit | ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad (patch) | |
| tree | 401c7ddec178185b6af4dc782bfbba4d20673e06 /test/e2e/run_volume_test.go | |
| parent | 259004f0a9cc18018127baec0bfcf8bc091dabb6 (diff) | |
| parent | 4d5199537737b0cfef47d3d2700013a787126d21 (diff) | |
| download | podman-ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad.tar.gz podman-ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad.tar.bz2 podman-ac3499cc9605dd2c7bfccedd6f9a95c7bc0dd9ad.zip | |
Merge pull request #9631 from rhatdan/pull
Fix podman build --pull-never
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" |