Skip to content

Commit

Permalink
Don't change the config dir in standalone mode
Browse files Browse the repository at this point in the history
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 <djordje.lukic@docker.com>
  • Loading branch information
rumpl committed Sep 28, 2023
1 parent 2118159 commit 6ef97e7
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pkg/e2e/framework.go
Expand Up @@ -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,
Expand Down

0 comments on commit 6ef97e7

Please sign in to comment.