summaryrefslogtreecommitdiff
path: root/pkg/api/server
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-14 14:53:59 +0200
committerGitHub <noreply@github.com>2020-04-14 14:53:59 +0200
commitd8853429eb13f1b244cc8c921fb845f7de8dee04 (patch)
tree0f8c0a60046f72c7a6fad82ef2aa5a4ac1fbcf90 /pkg/api/server
parent85c352d8bcffbf1593964e047763947d76d466e3 (diff)
parent71f14bd7920e566e2968bcc85505c7a7980de58b (diff)
downloadpodman-d8853429eb13f1b244cc8c921fb845f7de8dee04.tar.gz
podman-d8853429eb13f1b244cc8c921fb845f7de8dee04.tar.bz2
podman-d8853429eb13f1b244cc8c921fb845f7de8dee04.zip
Merge pull request #5755 from mheon/fix_attach
Improve APIv2 support for Attach
Diffstat (limited to 'pkg/api/server')
-rw-r--r--pkg/api/server/register_containers.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go
index e39e43bfb..8b9a9e312 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