From f3e0c386d2707b5cb358df04cfed8223696d8370 Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Fri, 26 Aug 2022 16:03:45 -0400 Subject: [PATCH] Revert "Apply newly loaded envvars to `DockerCli` and `APIClient`" (#9792) Revert "Merge pull request #9745 from ulyssessouza/apply-newly-loaded-envvars" This reverts commit 6fe34c45cad8790da99f195f3269eca0e8f0fc0b, reversing changes made to 10cfd551e3f1e6428dbcf16f480a1fdbaaf92986. Signed-off-by: Milas Bowman --- cmd/compose/compose.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index bc3799e6a..350eb5e88 100644 --- a/cmd/compose/compose.go +++ b/cmd/compose/compose.go @@ -32,8 +32,6 @@ import ( dockercli "github.com/docker/cli/cli" "github.com/docker/cli/cli-plugins/manager" "github.com/docker/cli/cli/command" - "github.com/docker/cli/cli/flags" - "github.com/docker/docker/client" "github.com/morikuni/aec" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -293,18 +291,6 @@ func RootCommand(dockerCli command.Cli, backend api.Service) *cobra.Command { if err != nil { return err } - - // Reset DockerCli and APIClient to get possible `DOCKER_HOST` and/or `DOCKER_CONTEXT` loaded from environment file. - err = dockerCli.Apply(func(cli *command.DockerCli) error { - return cli.Initialize(flags.NewClientOptions(), - command.WithInitializeClient(func(_ *command.DockerCli) (client.APIClient, error) { - return nil, nil - })) - }) - if err != nil { - return err - } - parent := cmd.Root() if parent != nil { parentPrerun := parent.PersistentPreRunE