Skip to content

Commit e73ecde

Browse files
authored
build(deps): upgrade Docker/Moby dependencies to v29 (#1055)
### Summary Upgrades Docker-related dependencies to be compatible with `github.com/docker/cli v29.0.2`, specifically migrating from `github.com/docker/docker v28.5.2` to `github.com/moby/moby/v2 v2.0.0-beta.3`. Resolves #1048. ### Changes - **Dependency upgrade**: Replaced `github.com/docker/docker v28.5.2+incompatible` with `github.com/moby/moby/v2 v2.0.0-beta.3` to align with Docker v29 module reorganization - **Import path updates** in `pkg/auth/docker/`: - `github.com/docker/docker/api/types/registry` → `github.com/moby/moby/api/types/registry` - `github.com/docker/docker/registry` → `github.com/moby/moby/v2/daemon/pkg/registry` - `github.com/docker/docker/errdefs` → `github.com/moby/moby/v2/errdefs` - **API compatibility fix**: Updated `registry.Service.Auth()` call to match new signature (2 return values instead of 3) ### Impact - ✅ No breaking changes to oras-go v1 public API - ✅ All changes are internal to `pkg/auth/docker` package - ✅ All tests pass (authentication, registry operations) - ✅ Maintains compatibility with existing consumers ### Testing - Build verification: ✅ Pass - `pkg/auth/docker` tests: ✅ Pass (10.8s) - `pkg/registry/remote` tests: ✅ Pass (7.8s) --------- Signed-off-by: Shiwei Zhang <shizh@microsoft.com>
1 parent 6706efa commit e73ecde

File tree

5 files changed

+129
-138
lines changed

5 files changed

+129
-138
lines changed

go.mod

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ go 1.24.0
55
require (
66
github.com/containerd/containerd v1.7.29
77
github.com/distribution/distribution/v3 v3.0.0
8-
github.com/docker/cli v28.5.2+incompatible
8+
github.com/docker/cli v29.0.2+incompatible
99
github.com/docker/distribution v2.8.3+incompatible
10-
github.com/docker/docker v28.5.2+incompatible
1110
github.com/docker/go-connections v0.6.0
11+
github.com/moby/moby/api v1.52.0
12+
github.com/moby/moby/v2 v2.0.0-beta.3
1213
github.com/opencontainers/go-digest v1.0.0
1314
github.com/opencontainers/image-spec v1.1.1
1415
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
@@ -21,74 +22,73 @@ require (
2122
)
2223

2324
require (
24-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
25+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
2526
github.com/beorn7/perks v1.0.1 // indirect
2627
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
2728
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2829
github.com/cespare/xxhash/v2 v2.3.0 // indirect
29-
github.com/containerd/errdefs v0.3.0 // indirect
30+
github.com/containerd/errdefs v1.0.0 // indirect
3031
github.com/containerd/log v0.1.0 // indirect
31-
github.com/containerd/platforms v0.2.1 // indirect
32-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
33-
github.com/davecgh/go-spew v1.1.1 // indirect
32+
github.com/containerd/platforms v1.0.0-rc.2 // indirect
33+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
34+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3435
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
3536
github.com/distribution/reference v0.6.0 // indirect
3637
github.com/docker/docker-credential-helpers v0.8.2 // indirect
37-
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
38+
github.com/docker/go-events v0.0.0-20250808211157-605354379745 // indirect
3839
github.com/docker/go-metrics v0.0.1 // indirect
39-
github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 // indirect
4040
github.com/felixge/httpsnoop v1.0.4 // indirect
4141
github.com/go-logr/logr v1.4.2 // indirect
4242
github.com/go-logr/stdr v1.2.2 // indirect
4343
github.com/google/uuid v1.6.0 // indirect
4444
github.com/gorilla/handlers v1.5.2 // indirect
4545
github.com/gorilla/mux v1.8.1 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
46+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
4747
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
48-
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
48+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4949
github.com/inconshreveable/mousetrap v1.1.0 // indirect
50-
github.com/klauspost/compress v1.17.11 // indirect
50+
github.com/klauspost/compress v1.18.0 // indirect
5151
github.com/moby/locker v1.0.1 // indirect
5252
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
53-
github.com/pmezard/go-difflib v1.0.0 // indirect
54-
github.com/prometheus/client_golang v1.20.5 // indirect
53+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
54+
github.com/prometheus/client_golang v1.22.0 // indirect
5555
github.com/prometheus/client_model v0.6.1 // indirect
56-
github.com/prometheus/common v0.60.1 // indirect
56+
github.com/prometheus/common v0.62.0 // indirect
5757
github.com/prometheus/procfs v0.15.1 // indirect
5858
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
5959
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
6060
github.com/redis/go-redis/v9 v9.7.3 // indirect
61-
github.com/spf13/pflag v1.0.9 // indirect
61+
github.com/spf13/pflag v1.0.10 // indirect
62+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6263
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
6364
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
64-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
65-
go.opentelemetry.io/otel v1.32.0 // indirect
65+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
66+
go.opentelemetry.io/otel v1.35.0 // indirect
6667
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
6768
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
68-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
69-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
70-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
71-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
72-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
69+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
70+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0 // indirect
71+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
72+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
73+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
7374
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
7475
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
7576
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
7677
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
7778
go.opentelemetry.io/otel/log v0.8.0 // indirect
78-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
79-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
79+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
80+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
8081
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
81-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
82-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
83-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
82+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
84+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8485
golang.org/x/net v0.47.0 // indirect
8586
golang.org/x/sys v0.38.0 // indirect
8687
golang.org/x/text v0.31.0 // indirect
87-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
88-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
89-
google.golang.org/grpc v1.68.0 // indirect
90-
google.golang.org/protobuf v1.35.2 // indirect
88+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
89+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
90+
google.golang.org/grpc v1.72.2 // indirect
91+
google.golang.org/protobuf v1.36.9 // indirect
9192
gopkg.in/yaml.v2 v2.4.0 // indirect
9293
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
gotest.tools/v3 v3.4.0 // indirect
9494
)

0 commit comments

Comments
 (0)