diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-04-07 16:52:47 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-04-13 14:08:01 -0400 |
| commit | 71f14bd7920e566e2968bcc85505c7a7980de58b (patch) | |
| tree | 08dcdfe55f0f84be40accb26196f1978336f1a44 /pkg/api/server/register_containers.go | |
| parent | c0e29b4a31e330927b7a980209b2aae192f9bafe (diff) | |
| download | podman-71f14bd7920e566e2968bcc85505c7a7980de58b.tar.gz podman-71f14bd7920e566e2968bcc85505c7a7980de58b.tar.bz2 podman-71f14bd7920e566e2968bcc85505c7a7980de58b.zip | |
Improve APIv2 support for Attach
A few major fixes here:
- Support for attaching to Configured containers, to match Docker
behavior.
- Support for stream parameter has been improved (we now properly
handle cases where it is not set).
- Initial support for logs parameter has been added.
- Setting attach streams when the container has a terminal is now
supported.
- Errors are properly reported once the hijack has begun.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'pkg/api/server/register_containers.go')
| -rw-r--r-- | pkg/api/server/register_containers.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index f126112d0..9ee900a11 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -517,13 +517,13 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // name: logs // required: false // type: boolean - // description: Not yet supported + // description: Stream all logs from the container across the connection. Happens before streaming attach (if requested). At least one of logs or stream must be set // - in: query // name: stream // required: false // type: boolean // default: true - // description: If passed, must be set to true; stream=false is not yet supported + // description: Attach to the container. If unset, and logs is set, only the container's logs will be sent. At least one of stream or logs must be set // - in: query // name: stdout // required: false @@ -1194,13 +1194,13 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // name: logs // required: false // type: boolean - // description: Not yet supported + // description: Stream all logs from the container across the connection. Happens before streaming attach (if requested). At least one of logs or stream must be set // - in: query // name: stream // required: false // type: boolean // default: true - // description: If passed, must be set to true; stream=false is not yet supported + // description: Attach to the container. If unset, and logs is set, only the container's logs will be sent. At least one of stream or logs must be set // - in: query // name: stdout // required: false |