From cf1baa9f3cfbf92041147ff7911218aa062bc0e6 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Sat, 14 Apr 2018 14:46:19 +0200 Subject: [PATCH 1/3] Add bash completion for `secret|config create --template-driver` Signed-off-by: Harald Albers Upstream-commit: 43024e2d57d7bdd63c358ac65bc3c6d1e6a4d702 Component: cli --- components/cli/contrib/completion/bash/docker | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index a3f1bd0db0..ca64d5396f 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -1220,14 +1220,18 @@ _docker_config_create() { --label|-l) return ;; + --template-driver) + COMPREPLY=( $( compgen -W "golang" -- "$cur" ) ) + return + ;; esac case "$cur" in -*) - COMPREPLY=( $( compgen -W "--help --label -l" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--help --label -l --template-driver" -- "$cur" ) ) ;; *) - local counter=$(__docker_pos_first_nonflag '--label|-l') + local counter=$(__docker_pos_first_nonflag '--label|-l|--template-driver') if [ "$cword" -eq "$((counter + 1))" ]; then _filedir fi @@ -4238,14 +4242,18 @@ _docker_secret_create() { --driver|-d|--label|-l) return ;; + --template-driver) + COMPREPLY=( $( compgen -W "golang" -- "$cur" ) ) + return + ;; esac case "$cur" in -*) - COMPREPLY=( $( compgen -W "--driver -d --help --label -l" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "--driver -d --help --label -l --template-driver" -- "$cur" ) ) ;; *) - local counter=$(__docker_pos_first_nonflag '--driver|-d|--label|-l') + local counter=$(__docker_pos_first_nonflag '--driver|-d|--label|-l|--template-driver') if [ "$cword" -eq "$((counter + 1))" ]; then _filedir fi From a013bf96ca91dac1be89450550b5b84462653a1e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 18 Apr 2018 13:20:22 -0700 Subject: [PATCH 2/3] Add Silvin as maintainer Signed-off-by: Sebastiaan van Stijn Upstream-commit: 60b371506c21795b627a8f39c57d2edf26cfb56a Component: cli --- components/cli/MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/cli/MAINTAINERS b/components/cli/MAINTAINERS index 6235cd830e..9e0bee03a5 100644 --- a/components/cli/MAINTAINERS +++ b/components/cli/MAINTAINERS @@ -27,6 +27,7 @@ "cpuguy83", "dnephin", "justincormack", + "silvin-lubecki", "stevvooe", "tibor", "tonistiigi", @@ -103,6 +104,11 @@ Email = "jeff@docker.com" GitHub = "programmerq" + [people.silvin-lubecki] + Name = "Silvin Lubecki" + Email = "silvin.lubecki@docker.com" + GitHub = "silvin-lubecki" + [people.stevvooe] Name = "Stephen Day" Email = "stephen.day@docker.com" From 05bd043ebaa9366a047d97e97dc582d84af563f7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 18 Apr 2018 13:30:19 -0700 Subject: [PATCH 3/3] Update AUTHORS and mailmap Signed-off-by: Sebastiaan van Stijn Upstream-commit: a761eff8c554ee73d1050f27d7eb846a1e2cb8e9 Component: cli --- components/cli/.mailmap | 4 +++- components/cli/AUTHORS | 12 +++++++++++- components/cli/MAINTAINERS | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/components/cli/.mailmap b/components/cli/.mailmap index 855b20e232..990fd0ea58 100644 --- a/components/cli/.mailmap +++ b/components/cli/.mailmap @@ -330,6 +330,7 @@ Pavel Tikhomirov Pawel Konczalski Peter Choi Peter Dave Hello +Peter Hsu Peter Jaffe Peter Nagy Peter Waller @@ -378,8 +379,9 @@ Stefan Berger Stefan Berger Stefan J. Wernli Stefan S. -Stephen Day +Stephen Day Stephen Day +Stephen Day Steve Desmond Sun Gengze <690388648@qq.com> Sun Jianbo diff --git a/components/cli/AUTHORS b/components/cli/AUTHORS index 39a4576020..bc1edce718 100644 --- a/components/cli/AUTHORS +++ b/components/cli/AUTHORS @@ -26,6 +26,7 @@ Alex Mavrogiannis Alexander Boyd Alexander Larsson Alexander Morozov +Alexander Ryabov Alexandre González Alfred Landrum Alicia Lauerman @@ -69,6 +70,7 @@ Bill Wang Bin Liu Bingshen Wang Boaz Shuster +Bogdan Anton Boris Pruessmann Bradley Cicenas Brandon Philips @@ -139,6 +141,7 @@ Dattatraya Kumbhar Dave Goodchild Dave Henderson Dave Tucker +David Beitey David Calavera David Cramer David Dooling @@ -222,6 +225,7 @@ Harry Zhang He Simei Helen Xie Henning Sprang +Henry N Hernan Garcia Hongbin Lu Hu Keping @@ -329,6 +333,7 @@ Kenfe-Mickaël Laventure Kevin Burke Kevin Feyrer Kevin Kern +Kevin Kirsche Kevin Meredith Kevin Richardson khaled souf @@ -367,6 +372,7 @@ Luca Marturana Lucas Chan Luka Hartwig Lukasz Zajaczkowski +Lydell Manganti Lénaïc Huard Ma Shimiao Mabin @@ -432,6 +438,7 @@ Máximo Cuadros Nace Oroz Nahum Shalman Nalin Dahyabhai +Nassim 'Nass' Eddequiouaq Natalie Parker Nate Brennand Nathan Hsieh @@ -463,7 +470,9 @@ Paul Weaver Pavel Pospisil Paweł Szczekutowicz Peeyush Gupta +Per Lundberg Peter Edge +Peter Hsu Peter Jaffe Peter Nagy Peter Salvatore @@ -475,6 +484,7 @@ pidster pixelistik Pratik Karki Prayag Verma +Preston Cowley Pure White Qiang Huang Qinglan Peng @@ -540,7 +550,7 @@ Srini Brahmaroutu Stefan S. Stefan Scherer Stefan Weil -Stephen Day +Stephen Day Stephen Rust Steve Durrheimer Steven Burgess diff --git a/components/cli/MAINTAINERS b/components/cli/MAINTAINERS index 6235cd830e..f9f1036a6e 100644 --- a/components/cli/MAINTAINERS +++ b/components/cli/MAINTAINERS @@ -105,7 +105,7 @@ [people.stevvooe] Name = "Stephen Day" - Email = "stephen.day@docker.com" + Email = "stevvooe@gmail.com" GitHub = "stevvooe" [people.thajeztah]