Skip to content

Commit 667fa7b

Browse files
thaJeztahvvoland
authored andcommitted
cli: remove uses of deprecated registry.SetCertsDir
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]: moby/moby@b633c4c Signed-off-by: Sebastiaan van Stijn <[email protected]> Signed-off-by: Paweł Gronowski <[email protected]>
1 parent 63f5930 commit 667fa7b

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

cli/cobra.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ package cli
33
import (
44
"fmt"
55
"os"
6-
"path/filepath"
76
"sort"
87
"strings"
98

109
"github.com/docker/cli/cli-plugins/metadata"
1110
"github.com/docker/cli/cli/command"
1211
cliflags "github.com/docker/cli/cli/flags"
13-
"github.com/docker/docker/pkg/homedir"
14-
"github.com/docker/docker/registry"
1512
"github.com/fvbommel/sortorder"
1613
"github.com/moby/term"
1714
"github.com/morikuni/aec"
@@ -62,13 +59,6 @@ func setupCommonRootCommand(rootCmd *cobra.Command) (*cliflags.ClientOptions, *c
6259
"docs.code-delimiter": `"`, // https://github.com/docker/cli-docs-tool/blob/77abede22166eaea4af7335096bdcedd043f5b19/annotation/annotation.go#L20-L22
6360
}
6461

65-
// Configure registry.CertsDir() when running in rootless-mode
66-
if os.Getenv("ROOTLESSKIT_STATE_DIR") != "" {
67-
if configHome, err := homedir.GetConfigHome(); err == nil {
68-
registry.SetCertsDir(filepath.Join(configHome, "docker/certs.d"))
69-
}
70-
}
71-
7262
return opts, helpCommand
7363
}
7464

0 commit comments

Comments
 (0)