From 68fb5ac1b912b34f2b68b0be4f2f321f905000e7 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Tue, 11 Aug 2015 09:17:32 -0700 Subject: [PATCH 1/3] Update bash completion for `docker run` Also fixed sort order of options using `sort -d` Signed-off-by: Harald Albers Upstream-commit: 644c158837b043113a689cab765997feb2e507a7 Component: engine --- components/engine/contrib/completion/bash/docker | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 5749dfe5ba..fcef20abfb 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -998,15 +998,16 @@ _docker_rmi() { _docker_run() { local options_with_args=" --add-host - --blkio-weight --attach -a + --blkio-weight --cap-add --cap-drop --cgroup-parent --cidfile - --cpuset --cpu-period --cpu-quota + --cpuset-cpus + --cpuset-mems --cpu-shares -c --device --dns @@ -1018,8 +1019,8 @@ _docker_run() { --group-add --hostname -h --ipc - --label -l --label-file + --label -l --link --log-driver --log-opt @@ -1027,14 +1028,15 @@ _docker_run() { --mac-address --memory -m --memory-swap + --memory-swappiness --name --net --pid --publish -p --restart --security-opt - --user -u --ulimit + --user -u --uts --volumes-from --volume -v @@ -1042,8 +1044,10 @@ _docker_run() { " local all_options="$options_with_args + --disable-content-trust=false --help --interactive -i + --oom-kill-disable --privileged --publish-all -P --read-only @@ -1053,7 +1057,7 @@ _docker_run() { [ "$command" = "run" ] && all_options="$all_options --detach -d --rm - --sig-proxy + --sig-proxy=false " local options_with_args_glob=$(__docker_to_extglob "$options_with_args") From a0599049a02a3e94edbdddb8c353e94704d47209 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 12 Aug 2015 04:37:16 -0700 Subject: [PATCH 2/3] Add options for the json-file logging driver to bash completion Signed-off-by: Harald Albers Upstream-commit: 5c1ad6f90cfc2aaf5d3fe416ca43e96774d608c5 Component: engine --- components/engine/contrib/completion/bash/docker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index fcef20abfb..0a47e0d13c 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -229,11 +229,12 @@ __docker_log_driver_options() { # see docs/reference/logging/index.md local fluentd_options="fluentd-address fluentd-tag" local gelf_options="gelf-address gelf-tag" + local json_file_options="max-file max-size" local syslog_options="syslog-address syslog-facility syslog-tag" case $(__docker_value_of_option --log-driver) in '') - COMPREPLY=( $( compgen -W "$fluentd_options $gelf_options $syslog_options" -S = -- "$cur" ) ) + COMPREPLY=( $( compgen -W "$fluentd_options $gelf_options $json_file_options $syslog_options" -S = -- "$cur" ) ) ;; fluentd) COMPREPLY=( $( compgen -W "$fluentd_options" -S = -- "$cur" ) ) @@ -241,6 +242,9 @@ __docker_log_driver_options() { gelf) COMPREPLY=( $( compgen -W "$gelf_options" -S = -- "$cur" ) ) ;; + json-file) + COMPREPLY=( $( compgen -W "$json_file_options" -S = -- "$cur" ) ) + ;; syslog) COMPREPLY=( $( compgen -W "$syslog_options" -S = -- "$cur" ) ) ;; From 4371aaaac53b09040444d39d106553b8a98e7756 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 12 Aug 2015 05:51:07 -0700 Subject: [PATCH 3/3] Add storage options to bash completion Signed-off-by: Harald Albers Upstream-commit: e4d8a8e1cac0ea473da315e86969dc810670b64e Component: engine --- .../engine/contrib/completion/bash/docker | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/components/engine/contrib/completion/bash/docker b/components/engine/contrib/completion/bash/docker index 0a47e0d13c..94564e2a22 100644 --- a/components/engine/contrib/completion/bash/docker +++ b/components/engine/contrib/completion/bash/docker @@ -139,7 +139,7 @@ __docker_value_of_option() { local counter=$((command_pos + 1)) while [ $counter -lt $cword ]; do case ${words[$counter]} in - $option_glob ) + @($option_glob) ) echo ${words[$counter + 1]} break ;; @@ -519,6 +519,38 @@ _docker_daemon() { COMPREPLY=( $( compgen -W "aufs btrfs devicemapper overlay vfs zfs" -- "$(echo $cur | tr '[:upper:]' '[:lower:]')" ) ) return ;; + --storage-opt) + local devicemapper_options=" + dm.basesize + dm.blkdiscard + dm.blocksize + dm.fs + dm.loopdatasize + dm.loopmetadatasize + dm.mkfsarg + dm.mountopt + dm.override_udev_sync_check + dm.thinpooldev + " + local zfs_options="zfs.fsname" + + case $(__docker_value_of_option '--storage-driver|-s') in + '') + COMPREPLY=( $( compgen -W "$devicemapper_options $zfs_options" -S = -- "$cur" ) ) + ;; + devicemapper) + COMPREPLY=( $( compgen -W "$devicemapper_options" -S = -- "$cur" ) ) + ;; + zfs) + COMPREPLY=( $( compgen -W "$zfs_options" -S = -- "$cur" ) ) + ;; + *) + return + ;; + esac + compopt -o nospace + return + ;; --log-level|-l) __docker_log_levels return @@ -532,6 +564,25 @@ _docker_daemon() { ;; esac + case "${words[$cword-2]}$prev=" in + *dm.blkdiscard=*) + COMPREPLY=( $( compgen -W "false true" -- "${cur#=}" ) ) + return + ;; + *dm.fs=*) + COMPREPLY=( $( compgen -W "ext4 xfs" -- "${cur#=}" ) ) + return + ;; + *dm.override_udev_sync_check=*) + COMPREPLY=( $( compgen -W "false true" -- "${cur#=}" ) ) + return + ;; + *dm.thinpooldev=*) + _filedir + return + ;; + esac + case "$cur" in -*) COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )