diff options
author | Peter Hunt <pehunt@redhat.com> | 2019-02-28 13:29:56 -0500 |
---|---|---|
committer | Peter Hunt <pehunt@redhat.com> | 2019-02-28 14:55:11 -0500 |
commit | d780e69559d8aa117e154a234d10f2112c32c8be (patch) | |
tree | 859558158bd18ba14da6962970e3e2108428bd07 /libpod/container_api.go | |
parent | 2e463b7720769d85dcdae516cad96c57e96b7464 (diff) | |
download | podman-d780e69559d8aa117e154a234d10f2112c32c8be.tar.gz podman-d780e69559d8aa117e154a234d10f2112c32c8be.tar.bz2 podman-d780e69559d8aa117e154a234d10f2112c32c8be.zip |
Allow Exec API user to override streams
Allow passing in of AttachStreams to libpod.Exec() for usage in podman healthcheck. An API caller can now specify different streams for stdout, stderr and stdin, or no streams at all.
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'libpod/container_api.go')
-rw-r--r-- | libpod/container_api.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 09d7f220d..6bef3c47d 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -203,9 +203,8 @@ func (c *Container) Kill(signal uint) error { } // Exec starts a new process inside the container -// TODO allow specifying streams to attach to // TODO investigate allowing exec without attaching -func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir string) error { +func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir string, streams *AttachStreams) error { var capList []string locked := false @@ -267,7 +266,7 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir logrus.Debugf("Creating new exec session in container %s with session id %s", c.ID(), sessionID) - execCmd, err := c.runtime.ociRuntime.execContainer(c, cmd, capList, env, tty, workDir, hostUser, sessionID) + execCmd, err := c.runtime.ociRuntime.execContainer(c, cmd, capList, env, tty, workDir, hostUser, sessionID, streams) if err != nil { return errors.Wrapf(err, "error exec %s", c.ID()) } |