From dff224a2052b2d7790fd5bba8dff84c79969cf65 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 8 Mar 2019 12:00:59 -0500 Subject: 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 --- test/e2e/pod_infra_container_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'test/e2e/pod_infra_container_test.go') 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() -- cgit v1.2.3-54-g00ecf