Skip to content

Commit bdeb2fd

Browse files
committed
fix(deps): resolve buildkit v0.27.1 compatibility with docker dependencies
1 parent 47b1327 commit bdeb2fd

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
github.com/mattn/go-colorable v0.1.14
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.27.1
25+
github.com/moby/go-archive v0.2.0
2526
github.com/opencontainers/go-digest v1.0.0
2627
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36.0.20260203052142-918ae3efe337
2728
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
@@ -97,6 +98,7 @@ require (
9798
github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
9899
github.com/containerd/ttrpc v1.2.7 // indirect
99100
github.com/containerd/typeurl/v2 v2.2.3 // indirect
101+
github.com/creack/pty v1.1.24 // indirect
100102
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
101103
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
102104
github.com/dimchansky/utfbom v1.1.1 // indirect
@@ -145,7 +147,6 @@ require (
145147
github.com/mitchellh/go-homedir v1.1.0 // indirect
146148
github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e // indirect
147149
github.com/moby/docker-image-spec v1.3.1 // indirect
148-
github.com/moby/go-archive v0.2.0 // indirect
149150
github.com/moby/locker v1.0.1 // indirect
150151
github.com/moby/moby/api v1.52.0 // indirect
151152
github.com/moby/moby/client v0.1.0 // indirect
@@ -221,6 +222,9 @@ require (
221222

222223
tool gotest.tools/gotestsum
223224

225+
// Force compatible version of docker/cli to avoid Go 1.23 iterator issues in v29.1.4
226+
replace github.com/docker/cli => github.com/docker/cli v28.5.0+incompatible
227+
224228
ignore (
225229
./docs
226230
./scripts

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
199199
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
200200
github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
201201
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
202-
github.com/docker/cli v29.1.4+incompatible h1:AI8fwZhqsAsrqZnVv9h6lbexeW/LzNTasf6A4vcNN8M=
203-
github.com/docker/cli v29.1.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
202+
github.com/docker/cli v28.5.0+incompatible h1:crVqLrtKsrhC9c00ythRx435H8LiQnUKRtJLRR+Auxk=
203+
github.com/docker/cli v28.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
204204
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
205205
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
206206
github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=

internal/namespaces/container/v1beta1/custom_deploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"github.com/docker/docker/api/types/image"
2121
dockerregistry "github.com/docker/docker/api/types/registry"
2222
docker "github.com/docker/docker/client"
23-
"github.com/docker/docker/pkg/archive"
2423
"github.com/docker/docker/pkg/jsonmessage"
24+
"github.com/moby/go-archive"
2525
"github.com/fatih/color"
2626
"github.com/scaleway/scaleway-cli/v2/core"
2727
"github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1beta1/getorcreate"

0 commit comments

Comments
 (0)