From 04347f793d1a81c160a35446272c33f774c39d69 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 25 Mar 2022 00:18:20 +0100 Subject: [PATCH] context: Endpoint.ClientOpts(): use client.WithVersionFromEnv() Signed-off-by: Sebastiaan van Stijn --- cli/context/docker/load.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cli/context/docker/load.go b/cli/context/docker/load.go index 5b181a70b9..e4016440b8 100644 --- a/cli/context/docker/load.go +++ b/cli/context/docker/load.go @@ -6,7 +6,6 @@ import ( "encoding/pem" "net" "net/http" - "os" "time" "github.com/docker/cli/cli/connhelper" @@ -122,12 +121,7 @@ func (c *Endpoint) ClientOpts() ([]client.Opt, error) { } } - version := os.Getenv("DOCKER_API_VERSION") - if version != "" { - result = append(result, client.WithVersion(version)) - } else { - result = append(result, client.WithAPIVersionNegotiation()) - } + result = append(result, client.WithVersionFromEnv(), client.WithAPIVersionNegotiation()) return result, nil }