From 667fa7bc929a76566c091619b17a5baf7187ab56 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 10 Mar 2025 21:10:48 +0100 Subject: [PATCH] cli: remove uses of deprecated registry.SetCertsDir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting with [moby@b633c4c], the registry package handles this internally and there's no longer a need to set the path manually for rootlessKit [moby@b633c4c]: https://github.com/moby/moby/commit/b633c4cc33bd0eff171646d252c48bcd2c3c3b16 Signed-off-by: Sebastiaan van Stijn Signed-off-by: Paweł Gronowski --- cli/cobra.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cli/cobra.go b/cli/cobra.go index 9cfcc616d6..7a14b6f483 100644 --- a/cli/cobra.go +++ b/cli/cobra.go @@ -3,15 +3,12 @@ package cli import ( "fmt" "os" - "path/filepath" "sort" "strings" "github.com/docker/cli/cli-plugins/metadata" "github.com/docker/cli/cli/command" cliflags "github.com/docker/cli/cli/flags" - "github.com/docker/docker/pkg/homedir" - "github.com/docker/docker/registry" "github.com/fvbommel/sortorder" "github.com/moby/term" "github.com/morikuni/aec" @@ -62,13 +59,6 @@ func setupCommonRootCommand(rootCmd *cobra.Command) (*cliflags.ClientOptions, *c "docs.code-delimiter": `"`, // https://github.com/docker/cli-docs-tool/blob/77abede22166eaea4af7335096bdcedd043f5b19/annotation/annotation.go#L20-L22 } - // Configure registry.CertsDir() when running in rootless-mode - if os.Getenv("ROOTLESSKIT_STATE_DIR") != "" { - if configHome, err := homedir.GetConfigHome(); err == nil { - registry.SetCertsDir(filepath.Join(configHome, "docker/certs.d")) - } - } - return opts, helpCommand }