From 74d51dc13b33e55c9c5ac121b198dbb94f21b4ea Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Sun, 14 Jan 2018 01:08:23 -0500 Subject: [PATCH 1/4] docs: add info for events backlog and scope 1. Adds `docker events` description info on the two scope types of events. 2. Adds `docker events` note in two places about backlog limit of event log. Further info and background info in Issue 727 Signed-off-by: Bret Fisher Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 988b9a0d9646137e1582e5def62f6b7754498a19) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/events.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/reference/commandline/events.md b/docs/reference/commandline/events.md index 5c450aa0a9..eea1218c3a 100644 --- a/docs/reference/commandline/events.md +++ b/docs/reference/commandline/events.md @@ -31,7 +31,12 @@ Options: ## Description Use `docker events` to get real-time events from the server. These events differ -per Docker object type. +per Docker object type. Different event types have different scopes. Local +scoped events are only seen on the node they take place on, and swarm scoped +events are seen on all managers. + +Only the last 1000 log events are returned. You can use filters to further limit +the number of events returned. ### Object types @@ -160,6 +165,9 @@ that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a fraction of a second no more than nine digits long. +Only the last 1000 log events are returned. You can use filters to further limit +the number of events returned. + #### Filtering The filtering flag (`-f` or `--filter`) format is of "key=value". If you would From 7ee8241f7165c4abaa00c08e82bf8b7b0a8ff772 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Fri, 10 May 2019 22:14:39 +0200 Subject: [PATCH 2/4] Add bash completion for `events --filter node` Signed-off-by: Harald Albers (cherry picked from commit c1639e1e42903e008d75ac1454f13d9c1d3b0e3e) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 92d5740861..732750478a 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -4848,6 +4848,10 @@ _docker_system_events() { __docker_complete_networks --cur "${cur##*=}" return ;; + node) + __docker_complete_nodes --cur "${cur##*=}" + return + ;; scope) COMPREPLY=( $( compgen -W "local swarm" -- "${cur##*=}" ) ) return @@ -4864,7 +4868,7 @@ _docker_system_events() { case "$prev" in --filter|-f) - COMPREPLY=( $( compgen -S = -W "container daemon event image label network scope type volume" -- "$cur" ) ) + COMPREPLY=( $( compgen -S = -W "container daemon event image label network node scope type volume" -- "$cur" ) ) __docker_nospace return ;; From 048af5b37b2a7b02e2a4834c56c6eadc0d1dabb7 Mon Sep 17 00:00:00 2001 From: Rohan Verma Date: Fri, 14 Jun 2019 13:20:14 +0530 Subject: [PATCH 3/4] fix: docker login autocomplete for zsh Changed `--user` to `--username` Signed-off-by: Rohan Verma (cherry picked from commit 1dc756e8dfcba59fb901092651f4e68210bdb580) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/zsh/_docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 94f042204d..ddc367d4d4 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -9,6 +9,7 @@ # - Felix Riedel # - Steve Durrheimer # - Vincent Bernat +# - Rohan Verma # # license: # @@ -2781,7 +2782,7 @@ __docker_subcommand() { $opts_help \ "($help -p --password)"{-p=,--password=}"[Password]:password: " \ "($help)--password-stdin[Read password from stdin]" \ - "($help -u --user)"{-u=,--user=}"[Username]:username: " \ + "($help -u --username)"{-u=,--username=}"[Username]:username: " \ "($help -)1:server: " && ret=0 ;; (logout) From 0dff33436c827787356927a1c5385f64f4c1a1a1 Mon Sep 17 00:00:00 2001 From: Matteo Orefice Date: Sun, 10 Feb 2019 14:04:45 +0000 Subject: [PATCH 4/4] Prevent bash process substitution error in cygwin Signed-off-by: Matteo Orefice (cherry picked from commit 0b49495b1d361efa72e3ef35ff000c863966bfe1) Signed-off-by: Sebastiaan van Stijn --- contrib/completion/bash/docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 732750478a..05c0c7401a 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -570,7 +570,7 @@ __docker_append_to_completions() { # The result is cached for the duration of one invocation of bash completion. __docker_fetch_info() { if [ -z "$info_fetched" ] ; then - read -r client_experimental server_experimental server_os < <(__docker_q version -f '{{.Client.Experimental}} {{.Server.Experimental}} {{.Server.Os}}') + read -r client_experimental server_experimental server_os <<< "$(__docker_q version -f '{{.Client.Experimental}} {{.Server.Experimental}} {{.Server.Os}}')" info_fetched=true fi }