Merge 8f503d3fce into 220033dd80

Merge pull request #5552 from thaJeztah/27.x_backport_fix_ConfigureAuth_deprecation
Merge pull request #5563 from vvoland/5554-27.x
2024-10-21 19:03:12 +01:00 · 2024-10-21 16:42:49 +01:00 · 2024-10-21 11:37:57 +02:00 · 2024-10-21 11:12:35 +02:00 · 2024-10-19 13:10:31 +02:00
2 changed files with 3 additions and 2 deletions
--- a/cli/command/registry.go
+++ b/cli/command/registry.go
@ -87,7 +87,8 @@ func GetDefaultAuthConfig(cfg *configfile.ConfigFile, checkCredStore bool, serve
 }

 // ConfigureAuth handles prompting of user's username and password if needed.
-// Deprecated: use PromptUserForCredentials instead.
+//
+// Deprecated: use [PromptUserForCredentials] instead.
 func ConfigureAuth(ctx context.Context, cli Cli, flUser, flPassword string, authConfig *registrytypes.AuthConfig, _ bool) error {
 	defaultUsername := authConfig.Username
 	serverAddress := authConfig.ServerAddress
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@ -5081,7 +5081,7 @@ _docker_system_events() {
 			return
 			;;
 		daemon)
-			local name=$(__docker_q info | sed -n 's/^\(ID\|Name\): //p')
+			local name=$(__docker_q info --format '{{.Info.Name}} {{.Info.ID}}')
 			COMPREPLY=( $( compgen -W "$name" -- "${cur##*=}" ) )
 			return
 			;;
Author	SHA1	Message	Date
Sebastiaan van Stijn	c32b94b521	Merge `8f503d3fce` into `220033dd80`	2024-10-21 19:03:12 +01:00
Laura Brehm	220033dd80	Merge pull request #5552 from thaJeztah/27.x_backport_fix_ConfigureAuth_deprecation	2024-10-21 16:42:49 +01:00
Sebastiaan van Stijn	dd013610c6	Merge pull request #5563 from vvoland/5554-27.x [27.x backport] Fix bash completion for `events --filter daemon=`	2024-10-21 11:37:57 +02:00
Harald Albers	dc36908ec5	Fix bash completion for `events --filter daemon=` Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit `3f7b156c85`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-10-21 11:12:35 +02:00
Sebastiaan van Stijn	a8a8f68268	cli/command: ConfigureAuth: fix deprecation comment Deprecation comments must have an empty line before them, otherwise tools and linters may not recognise them. While fixing this, also updated the reference to PromptUserForCredentials to be a docs-link to make it clickable. Updates `6e4818e7d6`. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `54e3685bcd`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-10-19 13:10:31 +02:00