Skip to content

Commit bc821f6

Browse files
authored
Merge pull request #336 from databacker/docker-bump
bump docker in tests to v26 and fix usage
2 parents b4a0dc6 + a1718b2 commit bc821f6

File tree

3 files changed

+68
-54
lines changed

3 files changed

+68
-54
lines changed

go.mod

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/aws/aws-sdk-go-v2/config v1.27.27
88
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.9
99
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
10-
github.com/docker/docker v24.0.9+incompatible
10+
github.com/docker/docker v26.1.4+incompatible
1111
github.com/docker/go-connections v0.4.0
1212
github.com/go-sql-driver/mysql v1.7.1
1313
github.com/johannesboyne/gofakes3 v0.0.0-20230506070712-04da935ef877
@@ -28,6 +28,20 @@ require (
2828
github.com/go-test/deep v1.1.0
2929
)
3030

31+
require (
32+
github.com/containerd/log v0.1.0 // indirect
33+
github.com/distribution/reference v0.6.0 // indirect
34+
github.com/felixge/httpsnoop v1.0.3 // indirect
35+
github.com/go-logr/logr v1.2.4 // indirect
36+
github.com/go-logr/stdr v1.2.2 // indirect
37+
github.com/moby/docker-image-spec v1.3.1 // indirect
38+
github.com/moby/sys/user v0.2.0 // indirect
39+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
40+
go.opentelemetry.io/otel v1.19.0 // indirect
41+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
42+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
43+
)
44+
3145
require (
3246
github.com/Microsoft/go-winio v0.6.1 // indirect
3347
github.com/aws/aws-sdk-go v1.44.256 // indirect
@@ -44,18 +58,16 @@ require (
4458
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
4559
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
4660
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
47-
github.com/aws/smithy-go v1.20.3 // indirect
61+
github.com/aws/smithy-go v1.20.3
4862
github.com/containerd/containerd v1.7.11 // indirect
4963
github.com/davecgh/go-spew v1.1.1 // indirect
50-
github.com/docker/distribution v2.8.2+incompatible // indirect
5164
github.com/docker/go-units v0.5.0 // indirect
5265
github.com/fsnotify/fsnotify v1.6.0 // indirect
5366
github.com/geoffgarside/ber v1.1.0 // indirect
5467
github.com/gogo/protobuf v1.3.2 // indirect
5568
github.com/google/uuid v1.6.0
5669
github.com/hashicorp/hcl v1.0.0 // indirect
5770
github.com/inconshreveable/mousetrap v1.1.0 // indirect
58-
github.com/jmespath/go-jmespath v0.4.0 // indirect
5971
github.com/klauspost/compress v1.16.5 // indirect
6072
github.com/kr/pretty v0.3.0 // indirect
6173
github.com/magiconair/properties v1.8.1 // indirect
@@ -66,7 +78,6 @@ require (
6678
github.com/morikuni/aec v1.0.0 // indirect
6779
github.com/opencontainers/go-digest v1.0.0 // indirect
6880
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
69-
github.com/opencontainers/runc v1.1.12 // indirect
7081
github.com/pelletier/go-toml v1.9.5 // indirect
7182
github.com/pkg/errors v0.9.1 // indirect
7283
github.com/pmezard/go-difflib v1.0.0 // indirect

0 commit comments

Comments
 (0)