diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-08 10:21:14 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-08 10:21:14 -0800 |
commit | c9d63fe89d0a79b069b56249aaa4c168b47649c0 (patch) | |
tree | e76db2f0730eb41a0ed7785cc590dfc14bfe6929 /libpod/container_api.go | |
parent | 757906189eabbc56a3b7e9723e9f72c3ccc654b0 (diff) | |
parent | 867669374c3fdd39f2629e53cbe7430f1bc3e085 (diff) | |
download | podman-c9d63fe89d0a79b069b56249aaa4c168b47649c0.tar.gz podman-c9d63fe89d0a79b069b56249aaa4c168b47649c0.tar.bz2 podman-c9d63fe89d0a79b069b56249aaa4c168b47649c0.zip |
Merge pull request #2097 from debarshiray/wip/debarshiray/podman-exec-workdir
Add a --workdir option to 'podman exec'
Diffstat (limited to 'libpod/container_api.go')
-rw-r--r-- | libpod/container_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index 09bc46905..4eaf737b0 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -262,7 +262,7 @@ 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 string) error { +func (c *Container) Exec(tty, privileged bool, env, cmd []string, user, workDir string) error { var capList []string locked := false @@ -324,7 +324,7 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user string) e 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, hostUser, sessionID) + execCmd, err := c.runtime.ociRuntime.execContainer(c, cmd, capList, env, tty, workDir, hostUser, sessionID) if err != nil { return errors.Wrapf(err, "error exec %s", c.ID()) } |