diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-07-01 13:55:03 -0400 |
|---|---|---|
| committer | Peter Hunt <pehunt@redhat.com> | 2019-07-22 15:57:23 -0400 |
| commit | a1a79c08b72793cf2f75490d8ffc844c3d16bd4a (patch) | |
| tree | 0ba4dd73229399a4c57e9d073327886fa3640707 /docs | |
| parent | cf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (diff) | |
| download | podman-a1a79c08b72793cf2f75490d8ffc844c3d16bd4a.tar.gz podman-a1a79c08b72793cf2f75490d8ffc844c3d16bd4a.tar.bz2 podman-a1a79c08b72793cf2f75490d8ffc844c3d16bd4a.zip | |
Implement conmon exec
This includes:
Implement exec -i and fix some typos in description of -i docs
pass failed runtime status to caller
Add resize handling for a terminal connection
Customize exec systemd-cgroup slice
fix healthcheck
fix top
add --detach-keys
Implement podman-remote exec (jhonce)
* Cleanup some orphaned code (jhonce)
adapt remote exec for conmon exec (pehunt)
Fix healthcheck and exec to match docs
Introduce two new OCIRuntime errors to more comprehensively describe situations in which the runtime can error
Use these different errors in branching for exit code in healthcheck and exec
Set conmon to use new api version
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-exec.1.md | 11 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/docs/podman-exec.1.md b/docs/podman-exec.1.md index 07d24e295..ab8d75626 100644 --- a/docs/podman-exec.1.md +++ b/docs/podman-exec.1.md @@ -10,19 +10,24 @@ podman\-exec - Execute a command in a running container **podman exec** executes a command in a running container. ## OPTIONS + +**--detach-keys**=*sequence* + +Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`. + **--env**, **-e** You may specify arbitrary environment variables that are available for the command to be executed. -**--interactive**, **-i** +**--interactive**, **-i**=*true|false* -Not supported. All exec commands are interactive by default. +When set to true, keep stdin open even if not attached. The default is *false*. **--latest**, **-l** Instead of providing the container name or ID, use the last created container. If you use methods other than Podman -to run containers such as CRI-O, the last started container could be from either of those methods. +to run containers such as CRI-O, the last started container could be from either of those methods. The latest option is not supported on the remote client. diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 6d95d6045..d6c7ae055 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -366,9 +366,7 @@ Path to the container-init binary. **--interactive**, **-i**=*true|false* -Keep STDIN open even if not attached. The default is *false*. - -When set to true, keep stdin open even if not attached. The default is false. +When set to true, keep stdin open even if not attached. The default is *false*. **--ip6**=*ip* |