diff --git a/flake.nix b/flake.nix index d732a0d51d..618bad1fd5 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ state = if (self ? rev) then "clean" else "dirty"; # This vendorHash represents a dervative of all go.mod dependancies and needs to be adjusted with every change - vendorHash = "sha256-cxB5awTUWgKFdexwSNyjuU//f4iKgHYFC1u907AVRKY="; + vendorHash = "sha256-jhgO8W6iMa+0aexOgUdPffObyxlGUNg8rQ0sSCGO2ZU="; src = ./.; diff --git a/go.mod b/go.mod index cba5995336..190a6e17cb 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( github.com/containers/image/v5 v5.31.1 github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f github.com/distribution/reference v0.6.0 - github.com/docker/cli v26.1.4+incompatible - github.com/docker/docker v26.1.4+incompatible + github.com/docker/cli v27.0.1+incompatible + github.com/docker/docker v27.0.1+incompatible github.com/docker/go-connections v0.5.0 github.com/drone/envsubst v1.0.3 github.com/fluxcd/cli-utils v0.36.0-flux.7 diff --git a/go.sum b/go.sum index 72fa082421..0782928600 100644 --- a/go.sum +++ b/go.sum @@ -316,13 +316,13 @@ github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aB github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v26.1.4+incompatible h1:I8PHdc0MtxEADqYJZvhBrW9bo8gawKwwenxRM7/rLu8= -github.com/docker/cli v26.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.0.1+incompatible h1:d/OrlblkOTkhJ1IaAGD1bLgUBtFQC/oP0VjkFMIN+B0= +github.com/docker/cli v27.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= 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 v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= -github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.0.1+incompatible h1:AbszR+lCnR3f297p/g0arbQoyhAkImxQOR/XO9YZeIg= +github.com/docker/docker v27.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo= github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= diff --git a/pkg/toi/drivers/docker/driver.go b/pkg/toi/drivers/docker/driver.go index 935f42560f..1367f092eb 100644 --- a/pkg/toi/drivers/docker/driver.go +++ b/pkg/toi/drivers/docker/driver.go @@ -207,7 +207,10 @@ func (d *Driver) initializeDockerCli() (command.Cli, error) { } if d.config[OptionQuiet] == "1" { - cli.Apply(command.WithCombinedStreams(io.Discard)) + err = cli.Apply(command.WithCombinedStreams(io.Discard)) + if err != nil { + return nil, err + } } d.dockerCli = cli @@ -259,7 +262,7 @@ func (d *Driver) Exec(op *install.Operation) (*install.OperationResult, error) { if err != nil { return nil, fmt.Errorf("error staging files: %w", err) } - options := types.CopyToContainerOptions{ + options := container.CopyToContainerOptions{ AllowOverwriteDirWithFile: false, } // This copies the tar to the root of the container. The tar has been assembled using the