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/oci.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/oci.go')
| -rw-r--r-- | libpod/oci.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 093bfdd35..31c1a7e85 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -728,7 +728,7 @@ func (r *OCIRuntime) unpauseContainer(ctr *Container) error { // TODO: Add --detach support // TODO: Convert to use conmon // TODO: add --pid-file and use that to generate exec session tracking -func (r *OCIRuntime) execContainer(c *Container, cmd, capAdd, env []string, tty bool, user, sessionID string) (*exec.Cmd, error) { +func (r *OCIRuntime) execContainer(c *Container, cmd, capAdd, env []string, tty bool, cwd, user, sessionID string) (*exec.Cmd, error) { if len(cmd) == 0 { return nil, errors.Wrapf(ErrInvalidArg, "must provide a command to execute") } @@ -749,7 +749,9 @@ func (r *OCIRuntime) execContainer(c *Container, cmd, capAdd, env []string, tty args = append(args, "exec") - args = append(args, "--cwd", c.config.Spec.Process.Cwd) + if cwd != "" { + args = append(args, "--cwd", cwd) + } args = append(args, "--pid-file", c.execPidPath(sessionID)) |