From 7f1baea3b05124d6914b5f3a1b0b1f30f970299c Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 1 May 2021 12:26:04 +0100 Subject: [PATCH] engine: resources: docker: Replace deprecated NewClient() with NewClientWithOpts() docker/client.NewClient() is deprecated in favour of NewClientWithOpts() which takes a series of client.Opt functions to configure the API client. As mgmt only passes the API version through, this simplifies the NewClient() calls. Signed-off-by: Joe Groocock --- engine/resources/docker_container.go | 2 +- engine/resources/docker_image.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/resources/docker_container.go b/engine/resources/docker_container.go index 1d11c55a..04dcfda7 100644 --- a/engine/resources/docker_container.go +++ b/engine/resources/docker_container.go @@ -148,7 +148,7 @@ func (obj *DockerContainerRes) Init(init *engine.Init) error { defer cancel() // Initialize the docker client. - obj.client, err = client.NewClient(client.DefaultDockerHost, obj.APIVersion, nil, nil) + obj.client, err = client.NewClientWithOpts(client.WithVersion(obj.APIVersion)) if err != nil { return errwrap.Wrapf(err, "error creating docker client") } diff --git a/engine/resources/docker_image.go b/engine/resources/docker_image.go index bbb4758d..6376c3fb 100644 --- a/engine/resources/docker_image.go +++ b/engine/resources/docker_image.go @@ -109,7 +109,7 @@ func (obj *DockerImageRes) Init(init *engine.Init) error { defer cancel() // Initialize the docker client. - obj.client, err = client.NewClient(client.DefaultDockerHost, obj.APIVersion, nil, nil) + obj.client, err = client.NewClientWithOpts(client.WithVersion(obj.APIVersion)) if err != nil { return errwrap.Wrapf(err, "error creating docker client") }