From 1148163c3ec90fc78b8f385e065984989b018e8b Mon Sep 17 00:00:00 2001
From: Ulysses Souza <ulyssessouza@gmail.com>
Date: Wed, 23 Jun 2021 09:41:00 -0300
Subject: [PATCH 1/2] Add completion for docker-compose plugin

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
---
 contrib/completion/bash/docker | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 9d8df082f1da..ed2f6a03a3ec 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -5486,6 +5486,23 @@ _docker_wait() {
 	_docker_container_wait
 }
 
+_docker_compose() {
+	local composePluginPath="${HOME}/.docker/cli-plugins/docker-compose"
+	local completionCommand="__completeNoDesc"
+  local resultArray=(${composePluginPath} ${completionCommand} compose)
+	for value in "${words[@]:2}"
+	do
+		if [[ "${value}" == "" ]] ; then
+			resultArray+=( "''" )
+		else
+			resultArray+=( "${value}" )
+		fi
+	done
+	local result=$(eval "${resultArray[*]}" 2> /dev/null)
+
+	COMPREPLY=( $(compgen -W "${result%%:*}" -- "$current") )
+}
+
 _docker() {
 	local previous_extglob_setting=$(shopt -p extglob)
 	shopt -s extglob
@@ -5555,11 +5572,15 @@ _docker() {
 		wait
 	)
 
+	local known_plugin_commands=(
+		compose
+	)
+
 	local experimental_server_commands=(
 		checkpoint
 	)
 
-	local commands=(${management_commands[*]} ${top_level_commands[*]})
+	local commands=(${management_commands[*]} ${top_level_commands[*]} ${known_plugin_commands[*]})
 	[ -z "$DOCKER_HIDE_LEGACY_COMMANDS" ] && commands+=(${legacy_commands[*]})
 
 	# These options are valid as global options for all client commands

From 5a8d7d506cbbe7cd0df3ed3903cb27a90a51e142 Mon Sep 17 00:00:00 2001
From: Ulysses Souza <ulyssessouza@gmail.com>
Date: Thu, 8 Jul 2021 09:07:08 -0300
Subject: [PATCH 2/2] Detect compose plugin

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
---
 contrib/completion/bash/docker | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index ed2f6a03a3ec..da5fc0e7789d 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -5486,21 +5486,21 @@ _docker_wait() {
 	_docker_container_wait
 }
 
+COMPOSE_PLUGIN_PATH=$(docker info --format '{{json .ClientInfo.Plugins}}' | sed -n 's/.*"Path":"\([^"]\+docker-compose\)".*/\1/p')
+
 _docker_compose() {
-	local composePluginPath="${HOME}/.docker/cli-plugins/docker-compose"
 	local completionCommand="__completeNoDesc"
-  local resultArray=(${composePluginPath} ${completionCommand} compose)
-	for value in "${words[@]:2}"
-	do
-		if [[ "${value}" == "" ]] ; then
+	local resultArray=($COMPOSE_PLUGIN_PATH $completionCommand compose)
+	for value in "${words[@]:2}"; do
+		if [ -z "$value" ]; then
 			resultArray+=( "''" )
 		else
-			resultArray+=( "${value}" )
+			resultArray+=( "$value" )
 		fi
 	done
-	local result=$(eval "${resultArray[*]}" 2> /dev/null)
+	local result=$(eval "${resultArray[*]}" 2> /dev/null | grep -v '^:[0-9]*$')
 
-	COMPREPLY=( $(compgen -W "${result%%:*}" -- "$current") )
+	COMPREPLY=( $(compgen -W "${result}" -- "$current") )
 }
 
 _docker() {
@@ -5572,9 +5572,11 @@ _docker() {
 		wait
 	)
 
-	local known_plugin_commands=(
-		compose
-	)
+	local known_plugin_commands=()
+
+	if [ -f "$COMPOSE_PLUGIN_PATH" ] ; then
+		known_plugin_commands+=("compose")
+	fi
 
 	local experimental_server_commands=(
 		checkpoint