From 6ef97e78163ba2f216d76b8fb866a565d719ee9f Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Wed, 27 Sep 2023 19:11:38 +0200 Subject: [PATCH] Don't change the config dir in standalone mode We want to take the original docker configuration in standalone mode so that we can run e2e tests against a containerd backed daemon Signed-off-by: Djordje Lukic --- pkg/e2e/framework.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/e2e/framework.go b/pkg/e2e/framework.go index e9ded780e93..2bd6c328698 100644 --- a/pkg/e2e/framework.go +++ b/pkg/e2e/framework.go @@ -93,8 +93,14 @@ func NewParallelCLI(t *testing.T, opts ...CLIOption) *CLI { func NewCLI(t testing.TB, opts ...CLIOption) *CLI { t.Helper() - configDir := t.TempDir() - initializePlugins(t, configDir) + var configDir string + if composeStandaloneMode { + hd, _ := os.UserHomeDir() + configDir = filepath.Join(hd, ".docker") + } else { + configDir = t.TempDir() + initializePlugins(t, configDir) + } c := &CLI{ ConfigDir: configDir,