From 63ea9eb594fdf07d77a541d6cf8505de148592af Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 25 Apr 2022 14:03:39 +0200 Subject: [PATCH] cmd/dockerd: don't call registry.SetCertsDir() twice This was introduced in 85572cac14168f9dc3fc3d9daa5eae1ba00eddf4, where I probably forgot to remove this code from an earlier iteration (I decided that having an explicit `configureCertsDir()` function call for this would make it more transparent that we're re-configuring a default). Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/config_unix.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go index 467ee39b2b..6bd6f4acc2 100644 --- a/cmd/dockerd/config_unix.go +++ b/cmd/dockerd/config_unix.go @@ -52,11 +52,6 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) error { if err != nil { return errors.Wrapf(err, "running with RootlessKit, but %s not installed", rootless.RootlessKitDockerProxyBinary) } - - configHome, err := homedir.GetConfigHome() - if err == nil { - registry.SetCertsDir(filepath.Join(configHome, "docker/certs.d")) - } } flags.StringVar(&conf.BridgeConfig.UserlandProxyPath, "userland-proxy-path", defaultUserlandProxyPath, "Path to the userland proxy binary") flags.StringVar(&conf.CgroupParent, "cgroup-parent", "", "Set parent cgroup for all containers")