diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go index 1a8a19247..ae4e8382a 100644 --- a/drivers/docker/driver.go +++ b/drivers/docker/driver.go @@ -704,7 +704,7 @@ func (d *Driver) resolveRegistryAuthentication(driverConfig *TaskConfig, repo st } // loadImage creates an image by loading it from the file system -func (d *Driver) loadImage(task *drivers.TaskConfig, driverConfig *TaskConfig, client *client.Client) (id string, user string, err error) { +func (d *Driver) loadImage(task *drivers.TaskConfig, driverConfig *TaskConfig, dockerClient *client.Client) (id string, user string, err error) { archive := filepath.Join(task.TaskDir().LocalDir, driverConfig.LoadImage) d.logger.Debug("loading image from disk", "archive", archive) @@ -714,12 +714,12 @@ func (d *Driver) loadImage(task *drivers.TaskConfig, driverConfig *TaskConfig, c return "", "", fmt.Errorf("unable to open image archive: %v", err) } - if _, err := client.ImageLoad(d.ctx, f, true); err != nil { + if _, err := dockerClient.ImageLoad(d.ctx, f, client.ImageLoadWithQuiet(true)); err != nil { return "", "", err } f.Close() - dockerImage, _, err := client.ImageInspectWithRaw(d.ctx, driverConfig.Image) + dockerImage, _, err := dockerClient.ImageInspectWithRaw(d.ctx, driverConfig.Image) if err != nil { return "", "", recoverableErrTimeouts(err) } diff --git a/go.mod b/go.mod index b1e25c8ef..a8f150798 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/creack/pty v1.1.24 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.5.1+incompatible - github.com/docker/docker v27.4.1+incompatible + github.com/docker/docker v28.0.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/dustin/go-humanize v1.0.1 diff --git a/go.sum b/go.sum index c760b3aac..2bbaa91df 100644 --- a/go.sum +++ b/go.sum @@ -880,8 +880,8 @@ github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3L github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= -github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0= +github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=