diff options
author | zhangguanzhang <zhangguanzhang@qq.com> | 2020-08-01 23:37:41 +0800 |
---|---|---|
committer | zhangguanzhang <zhangguanzhang@qq.com> | 2020-08-03 21:40:06 +0800 |
commit | a5a0ba9cb49a5a311fb0e9245f5bc8e0a35656ba (patch) | |
tree | 1b7e705ed7518f40511f2a03eecf2ee27e64ba9e | |
parent | b4fa2c2517fd313bb0000f7697274d2ab2498265 (diff) | |
download | podman-a5a0ba9cb49a5a311fb0e9245f5bc8e0a35656ba.tar.gz podman-a5a0ba9cb49a5a311fb0e9245f5bc8e0a35656ba.tar.bz2 podman-a5a0ba9cb49a5a311fb0e9245f5bc8e0a35656ba.zip |
implement the exitcode when start a container with attach
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
-rw-r--r-- | cmd/podman/containers/start.go | 11 | ||||
-rw-r--r-- | test/e2e/start_test.go | 12 |
2 files changed, 20 insertions, 3 deletions
diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go index 05fdfc780..ccbe80317 100644 --- a/cmd/podman/containers/start.go +++ b/cmd/podman/containers/start.go @@ -99,12 +99,17 @@ func start(cmd *cobra.Command, args []string) error { } for _, r := range responses { - if r.Err == nil && !startOptions.Attach { - fmt.Println(r.RawInput) + if r.Err == nil { + if startOptions.Attach { + // Implement the exitcode when the only one container is enabled attach + registry.SetExitCode(r.ExitCode) + } else { + fmt.Println(r.RawInput) + } } else { errs = append(errs, r.Err) } } - // TODO need to understand an implement exitcodes + return errs.PrintErrors() } diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 78410c9cf..aef5ca001 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -86,6 +86,18 @@ var _ = Describe("Podman start", func() { Expect(session.OutputToString()).To(Equal(name)) }) + It("podman start single container with attach and test the signal", func() { + SkipIfRemote() + session := podmanTest.Podman([]string{"create", "--entrypoint", "sh", ALPINE, "-c", "exit 1"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + cid := session.OutputToString() + session = podmanTest.Podman([]string{"start", "--attach", cid}) + session.WaitWithDefaultTimeout() + // It should forward the signal + Expect(session.ExitCode()).To(Equal(1)) + }) + It("podman start multiple containers", func() { session := podmanTest.Podman([]string{"create", "-d", "--name", "foobar99", ALPINE, "ls"}) session.WaitWithDefaultTimeout() |