Skip to content

Commit dce2871

Browse files
L3n41cclaude
andcommitted
[VULN-59766] chore(deps): migrate from github.com/docker/docker to github.com/moby/moby
Migrate all direct imports of github.com/docker/docker to the equivalent github.com/moby/moby sub-modules (client v0.2.2 and api v1.53.0), eliminating the vulnerable dependency from production and test code. Production code: - pkg/fanal/image/daemon: migrate Docker client, types, and API calls to moby/moby/client and moby/moby/api/types/image - pkg/fanal/artifact/container: replace docker/docker/pkg/system with containerd/continuity/sysx for Lgetxattr Test code: - Replace HostConfigModifier callbacks with AutoRemove field on testcontainers.ContainerRequest in all integration tests - Migrate all test imports from docker/docker to moby/moby equivalents - Update test expected values for the new InspectResponse type go.mod: - Add direct dependencies on moby/moby/client and moby/moby/api - docker/docker demoted to indirect (transitive only) - Add replace directive redirecting docker/docker to patched moby/moby 27.x branch commit (v27.5.2-0.20250218170852-77446557b0f8) Jira: VULN-59766, VULN-59767, VULN-59774, VULN-59775 Jira: CONTINT-5217, CONTINT-5218, CONTINT-5219, CONTINT-5220 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 81422df commit dce2871

18 files changed

Lines changed: 167 additions & 204 deletions

File tree

go.mod

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aquasecurity/trivy
22

3-
go 1.23
3+
go 1.24.0
44

55
require (
66
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
@@ -35,8 +35,8 @@ require (
3535
github.com/containerd/platforms v1.0.0-rc.1
3636
github.com/distribution/reference v0.6.0
3737
github.com/docker/cli v27.5.0+incompatible
38-
github.com/docker/docker v27.5.0+incompatible
39-
github.com/docker/go-connections v0.5.0
38+
github.com/docker/docker v27.5.0+incompatible // indirect
39+
github.com/docker/go-connections v0.6.0
4040
github.com/docker/go-units v0.5.0
4141
github.com/fatih/color v1.18.0
4242
github.com/go-git/go-git/v5 v5.13.2
@@ -72,7 +72,7 @@ require (
7272
github.com/moby/buildkit v0.18.2
7373
github.com/open-policy-agent/opa v0.70.0
7474
github.com/opencontainers/go-digest v1.0.0
75-
github.com/opencontainers/image-spec v1.1.0
75+
github.com/opencontainers/image-spec v1.1.1
7676
github.com/openvex/discovery v0.1.1-0.20240802171711-7c54efc57553
7777
github.com/openvex/go-vex v0.2.5
7878
github.com/owenrumney/go-sarif/v2 v2.3.3
@@ -119,7 +119,7 @@ require (
119119
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
120120
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
121121
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
122-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
122+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
123123
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
124124
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
125125
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
@@ -194,7 +194,7 @@ require (
194194
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
195195
github.com/golang/snappy v0.0.4 // indirect
196196
github.com/google/certificate-transparency-go v1.1.8 // indirect
197-
github.com/google/go-cmp v0.6.0 // indirect
197+
github.com/google/go-cmp v0.7.0 // indirect
198198
github.com/gorilla/mux v1.8.1 // indirect
199199
github.com/hashicorp/errwrap v1.1.0 // indirect
200200
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -216,15 +216,15 @@ require (
216216
github.com/mattn/go-runewidth v0.0.16 // indirect
217217
github.com/mitchellh/copystructure v1.2.0 // indirect
218218
github.com/mitchellh/reflectwalk v1.0.2 // indirect
219-
github.com/moby/docker-image-spec v1.3.1 // indirect
219+
github.com/moby/docker-image-spec v1.3.1
220220
github.com/moby/locker v1.0.1 // indirect
221221
github.com/moby/patternmatcher v0.6.0 // indirect
222222
github.com/moby/sys/mountinfo v0.7.2 // indirect
223223
github.com/moby/sys/sequential v0.6.0 // indirect
224224
github.com/moby/sys/signal v0.7.1 // indirect
225225
github.com/moby/sys/user v0.3.0 // indirect
226226
github.com/moby/sys/userns v0.1.0 // indirect
227-
github.com/moby/term v0.5.0 // indirect
227+
github.com/moby/term v0.5.2 // indirect
228228
github.com/morikuni/aec v1.0.0 // indirect
229229
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
230230
github.com/ncruces/go-strftime v0.1.9 // indirect
@@ -286,16 +286,16 @@ require (
286286
go.mongodb.org/mongo-driver v1.14.0 // indirect
287287
go.opencensus.io v0.24.0 // indirect
288288
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
289-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
290-
go.opentelemetry.io/otel v1.34.0 // indirect
291-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
292-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
293-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
289+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
290+
go.opentelemetry.io/otel v1.35.0 // indirect
291+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
292+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
293+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
294294
go.uber.org/multierr v1.11.0 // indirect
295295
go.uber.org/zap v1.27.0 // indirect
296296
golang.org/x/oauth2 v0.25.0 // indirect
297-
golang.org/x/sys v0.31.0 // indirect
298-
golang.org/x/time v0.9.0 // indirect
297+
golang.org/x/sys v0.33.0 // indirect
298+
golang.org/x/time v0.11.0 // indirect
299299
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
300300
google.golang.org/grpc v1.70.0 // indirect
301301
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
@@ -322,9 +322,16 @@ require (
322322
github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 // indirect
323323
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 // indirect
324324
github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 // indirect
325-
github.com/creack/pty v1.1.23 // indirect
326325
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
326+
github.com/moby/moby/api v1.53.0
327+
github.com/moby/moby/client v0.2.2
327328
github.com/oklog/ulid/v2 v2.1.0 // indirect
328329
github.com/onsi/gomega v1.35.1 // indirect
329330
github.com/samber/oops v1.15.0 // indirect
330331
)
332+
333+
// github.com/docker/docker v27 has known security vulnerabilities.
334+
// The 27.x branch of moby/moby contains fixes beyond v27.5.1.
335+
// Redirect to the latest 27.x commit until transitive dependencies
336+
// migrate to github.com/moby/moby sub-modules.
337+
replace github.com/docker/docker => github.com/moby/moby v27.5.2-0.20250218170852-77446557b0f8+incompatible

0 commit comments

Comments
 (0)