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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/podman/common.go | 9 | ||||
| -rw-r--r-- | cmd/podman/exec.go | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 0fc9a6acc..d934c8699 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -28,6 +28,10 @@ var ( Name: "latest, l", Usage: "act on the latest pod podman is aware of", } + WorkDirFlag = cli.StringFlag{ + Name: "workdir, w", + Usage: "Working directory inside the container", + } ) const ( @@ -522,10 +526,7 @@ var createFlags = []cli.Flag{ Name: "volumes-from", Usage: "Mount volumes from the specified container(s) (default [])", }, - cli.StringFlag{ - Name: "workdir, w", - Usage: "Working `directory inside the container", - }, + WorkDirFlag, } func getFormat(c *cli.Context) (string, error) { diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go index c03834dea..073e72e64 100644 --- a/cmd/podman/exec.go +++ b/cmd/podman/exec.go @@ -34,6 +34,7 @@ var ( Usage: "Sets the username or UID used and optionally the groupname or GID for the specified command", }, LatestFlag, + WorkDirFlag, } execDescription = ` podman exec @@ -108,5 +109,5 @@ func execCmd(c *cli.Context) error { envs = append(envs, fmt.Sprintf("%s=%s", k, v)) } - return ctr.Exec(c.Bool("tty"), c.Bool("privileged"), envs, cmd, c.String("user")) + return ctr.Exec(c.Bool("tty"), c.Bool("privileged"), envs, cmd, c.String("user"), c.String("workdir")) } |