Skip to content

Commit c10e0e8

Browse files
eriknordmarkclaude
andcommitted
Explicily redirect github.com/docker/cli to fix oras incomatibility
Redirect to v28.5.1+incompatible Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: eriknordmark <erik@zededa.com>
1 parent 7094b17 commit c10e0e8

File tree

8 files changed

+26
-24
lines changed

8 files changed

+26
-24
lines changed

pkg/pillar/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ require (
289289
)
290290

291291
replace (
292+
github.com/docker/cli => github.com/docker/cli v28.5.1+incompatible
292293
github.com/openshift/api => github.com/openshift/api v0.0.0-20210105115604-44119421ec6b
293294

294295
k8s.io/api => k8s.io/api v0.32.5

pkg/pillar/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN
246246
github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU=
247247
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
248248
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
249-
github.com/docker/cli v29.2.0+incompatible h1:9oBd9+YM7rxjZLfyMGxjraKBKE4/nVyvVfN4qNl9XRM=
250-
github.com/docker/cli v29.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
249+
github.com/docker/cli v28.5.1+incompatible h1:ESutzBALAD6qyCLqbQSEf1a/U8Ybms5agw59yGVc+yY=
250+
github.com/docker/cli v28.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
251251
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
252252
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
253253
github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=

pkg/pillar/vendor/github.com/docker/cli/AUTHORS

Lines changed: 2 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/docker/cli/cli/config/config.go

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/docker/cli/cli/config/configfile/file.go

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/docker/cli/cli/config/memorystore/store.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/github.com/docker/cli/cli/config/types/authconfig.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/pillar/vendor/modules.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ github.com/digitalocean/go-libvirt/socket/dialers
473473
# github.com/distribution/reference v0.6.0
474474
## explicit; go 1.20
475475
github.com/distribution/reference
476-
# github.com/docker/cli v29.2.0+incompatible
476+
# github.com/docker/cli v29.2.0+incompatible => github.com/docker/cli v28.5.1+incompatible
477477
## explicit
478478
github.com/docker/cli/cli/config
479479
github.com/docker/cli/cli/config/configfile
@@ -2313,6 +2313,7 @@ tags.cncf.io/container-device-interface/pkg/parser
23132313
# tags.cncf.io/container-device-interface/specs-go v0.8.0
23142314
## explicit; go 1.19
23152315
tags.cncf.io/container-device-interface/specs-go
2316+
# github.com/docker/cli => github.com/docker/cli v28.5.1+incompatible
23162317
# github.com/openshift/api => github.com/openshift/api v0.0.0-20210105115604-44119421ec6b
23172318
# k8s.io/api => k8s.io/api v0.32.5
23182319
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.5

0 commit comments

Comments
 (0)