diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-10 16:29:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 16:29:48 -0400 |
| commit | 75d2fe63db370d2143bc23519b1026410d6d81f4 (patch) | |
| tree | f25d7ddee2af14308eba099064d66ee013266427 /test/e2e | |
| parent | f24538b85e9c81be3cb1f4990bd3613986621746 (diff) | |
| parent | 39c493b3fcc8c1c5203e4511d7ff3250d11de285 (diff) | |
| download | podman-75d2fe63db370d2143bc23519b1026410d6d81f4.tar.gz podman-75d2fe63db370d2143bc23519b1026410d6d81f4.tar.bz2 podman-75d2fe63db370d2143bc23519b1026410d6d81f4.zip | |
Merge pull request #7256 from mheon/fix_cmd_with_entrypoint
Do not use image CMD if user gave ENTRYPOINT
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/run_test.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 9cb76d1f6..dc44d3b3f 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1143,7 +1143,7 @@ USER mail` Expect(session.ErrorToString()).To(ContainSubstring("Invalid umask")) }) - It("podman run makes entrypoint from image", func() { + It("podman run makes workdir from image", func() { // BuildImage does not seem to work remote SkipIfRemote() dockerfile := `FROM busybox @@ -1154,4 +1154,13 @@ WORKDIR /madethis` Expect(session.ExitCode()).To(Equal(0)) Expect(session.OutputToString()).To(ContainSubstring("/madethis")) }) + + It("podman run --entrypoint does not use image command", func() { + session := podmanTest.Podman([]string{"run", "--entrypoint", "/bin/echo", ALPINE}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + // We can't guarantee the output is completely empty, some + // nonprintables seem to work their way in. + Expect(session.OutputToString()).To(Not(ContainSubstring("/bin/sh"))) + }) }) |