@@ -602,19 +602,11 @@ __docker_append_to_completions() {
602
602
# The result is cached for the duration of one invocation of bash completion.
603
603
__docker_fetch_info () {
604
604
if [ -z " $info_fetched " ] ; then
605
- read -r client_experimental server_experimental server_os <<< " $(__docker_q version -f '{{.Client.Experimental}} {{.Server.Experimental}} {{.Server.Os}}')"
605
+ read -r server_experimental server_os <<< " $(__docker_q version -f '{{.Server.Experimental}} {{.Server.Os}}')"
606
606
info_fetched=true
607
607
fi
608
608
}
609
609
610
- # __docker_client_is_experimental tests whether the Docker cli is configured to support
611
- # experimental features. If so, the function exits with 0 (true).
612
- # Otherwise, or if the result cannot be determined, the exit value is 1 (false).
613
- __docker_client_is_experimental () {
614
- __docker_fetch_info
615
- [ " $client_experimental " = " true" ]
616
- }
617
-
618
610
# __docker_server_is_experimental tests whether the currently configured Docker
619
611
# server runs in experimental mode. If so, the function exits with 0 (true).
620
612
# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
@@ -1225,7 +1217,6 @@ _docker_docker() {
1225
1217
* )
1226
1218
local counter=$( __docker_pos_first_nonflag " $( __docker_to_extglob " $global_options_with_args " ) " )
1227
1219
if [ " $cword " -eq " $counter " ]; then
1228
- __docker_client_is_experimental && commands+=(${experimental_client_commands[*]} )
1229
1220
__docker_server_is_experimental && commands+=(${experimental_server_commands[*]} )
1230
1221
COMPREPLY=( $( compgen -W " ${commands[*]} help" -- " $cur " ) )
1231
1222
fi
@@ -5492,6 +5483,7 @@ _docker() {
5492
5483
container
5493
5484
context
5494
5485
image
5486
+ manifest
5495
5487
network
5496
5488
node
5497
5489
plugin
@@ -5550,10 +5542,6 @@ _docker() {
5550
5542
wait
5551
5543
)
5552
5544
5553
- local experimental_client_commands=(
5554
- manifest
5555
- )
5556
-
5557
5545
local experimental_server_commands=(
5558
5546
checkpoint
5559
5547
)
@@ -5581,7 +5569,7 @@ _docker() {
5581
5569
# variables to cache server info, populated on demand for performance reasons
5582
5570
local info_fetched server_experimental server_os
5583
5571
# variables to cache client info, populated on demand for performance reasons
5584
- local client_experimental stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
5572
+ local stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
5585
5573
5586
5574
local host config context
5587
5575
0 commit comments