diff options
author | Peter Hunt <pehunt@redhat.com> | 2019-03-08 12:00:59 -0500 |
---|---|---|
committer | Peter Hunt <pehunt@redhat.com> | 2019-03-08 15:15:15 -0500 |
commit | dff224a2052b2d7790fd5bba8dff84c79969cf65 (patch) | |
tree | 6da98f59cb14eaee20ca63f1147e53efe7f5ed7a /test/e2e | |
parent | 90319bcf5202bb54e6e6bf59e4b887fa462e4714 (diff) | |
download | podman-dff224a2052b2d7790fd5bba8dff84c79969cf65.tar.gz podman-dff224a2052b2d7790fd5bba8dff84c79969cf65.tar.bz2 podman-dff224a2052b2d7790fd5bba8dff84c79969cf65.zip |
Default to image entrypoint for infra container
If the pod infra container is overriden, we want to run the entry point of the image, instead of the default infra command. This allows users to override the infra-image with greater ease.
Also use process environment variables from image
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/pod_infra_container_test.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index d9e5d380a..cb476c7f6 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -69,6 +69,18 @@ var _ = Describe("Podman pod create", func() { Expect(len(check.OutputToStringArray())).To(Equal(1)) }) + It("podman start infra container different image", func() { + session := podmanTest.Podman([]string{"pod", "create", "--infra-image", BB}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + podID := session.OutputToString() + + session = podmanTest.Podman([]string{"pod", "start", podID}) + session.WaitWithDefaultTimeout() + // If we use the default entry point, we should exit with no error + Expect(session.ExitCode()).To(Equal(0)) + }) + It("podman infra container namespaces", func() { session := podmanTest.Podman([]string{"pod", "create"}) session.WaitWithDefaultTimeout() |