Skip to content

Commit 98deacf

Browse files
AkihiroSudaAkihiroSuda
committed
go.mod: github.com/containerd/containerd v1.7.0-rc.3
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 75123c6 commit 98deacf

304 files changed

Lines changed: 9634 additions & 6816 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cache/manager_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"time"
2020

2121
ctdcompression "github.com/containerd/containerd/archive/compression"
22+
"github.com/containerd/containerd/archive/tarheader"
2223
"github.com/containerd/containerd/content"
2324
"github.com/containerd/containerd/content/local"
2425
"github.com/containerd/containerd/diff/apply"
@@ -2597,7 +2598,7 @@ func fileToBlob(file *os.File, compress bool) ([]byte, ocispecs.Descriptor, erro
25972598
return nil, ocispecs.Descriptor{}, err
25982599
}
25992600

2600-
fi, err := tar.FileInfoHeader(info, "")
2601+
fi, err := tarheader.FileInfoHeaderNoLookups(info, "")
26012602
if err != nil {
26022603
return nil, ocispecs.Descriptor{}, err
26032604
}

‎frontend/dockerfile/dockerfile_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6558,7 +6558,7 @@ FROM scratch
65586558
COPY --from=0 / /
65596559
`)
65606560

6561-
const expectedDigest = "sha256:23bfe9c494f4b4ae9368d989035c70b3a34aa0bfc991618b3e54dcce2eee4bf8"
6561+
const expectedDigest = "sha256:14b7856c37777ad7e8f4a801cb98abec98c5ae0f4a8dbb152447d18f1c1a3ba9"
65626562

65636563
dir, err := integration.Tmpdir(
65646564
t,

‎go.mod‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0
77
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1
88
github.com/Microsoft/go-winio v0.6.0
9-
github.com/Microsoft/hcsshim v0.10.0-rc.5
9+
github.com/Microsoft/hcsshim v0.10.0-rc.7
1010
github.com/agext/levenshtein v1.2.3
1111
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
1212
github.com/aws/aws-sdk-go-v2/config v1.15.5
@@ -15,10 +15,10 @@ require (
1515
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.9
1616
github.com/aws/smithy-go v1.11.2
1717
github.com/containerd/console v1.0.3
18-
github.com/containerd/containerd v1.7.0-beta.4
18+
github.com/containerd/containerd v1.7.0-rc.3
1919
github.com/containerd/continuity v0.3.0
2020
github.com/containerd/fuse-overlayfs-snapshotter v1.0.2
21-
github.com/containerd/go-cni v1.1.9-0.20230211172349-6603d5bd8941
21+
github.com/containerd/go-cni v1.1.9
2222
github.com/containerd/go-runc v1.0.0
2323
github.com/containerd/nydus-snapshotter v0.3.1
2424
github.com/containerd/stargz-snapshotter v0.14.1
@@ -41,7 +41,7 @@ require (
4141
github.com/hashicorp/go-multierror v1.1.1
4242
github.com/hashicorp/golang-lru v0.5.4
4343
github.com/in-toto/in-toto-golang v0.5.0
44-
github.com/klauspost/compress v1.15.15
44+
github.com/klauspost/compress v1.16.0
4545
github.com/mitchellh/hashstructure/v2 v2.0.2
4646
github.com/moby/locker v1.0.1
4747
github.com/moby/patternmatcher v0.5.0
@@ -51,47 +51,46 @@ require (
5151
github.com/opencontainers/go-digest v1.0.0
5252
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
5353
github.com/opencontainers/runc v1.1.4
54-
github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb
55-
github.com/opencontainers/selinux v1.10.2
54+
github.com/opencontainers/runtime-spec v1.1.0-rc.1
55+
github.com/opencontainers/selinux v1.11.0
5656
github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170
5757
github.com/pelletier/go-toml v1.9.5
5858
github.com/pkg/errors v0.9.1
5959
github.com/pkg/profile v1.5.0
6060
github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002
6161
github.com/sirupsen/logrus v1.9.0
6262
github.com/spdx/tools-golang v0.3.1-0.20230104082527-d6f58551be3f
63-
github.com/stretchr/testify v1.8.1
63+
github.com/stretchr/testify v1.8.2
6464
github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa
6565
github.com/tonistiigi/go-actions-cache v0.0.0-20220404170428-0bdeb6e1eac7
6666
github.com/tonistiigi/go-archvariant v1.0.0
6767
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
6868
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f
6969
github.com/urfave/cli v1.22.12
70-
go.etcd.io/bbolt v1.3.6
71-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0
72-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.37.0
73-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0
74-
go.opentelemetry.io/otel v1.12.0
75-
go.opentelemetry.io/otel/exporters/jaeger v1.11.2
76-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0
77-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0
78-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.12.0
79-
go.opentelemetry.io/otel/sdk v1.12.0
80-
go.opentelemetry.io/otel/trace v1.12.0
70+
go.etcd.io/bbolt v1.3.7
71+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0
72+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0
73+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0
74+
go.opentelemetry.io/otel v1.14.0
75+
go.opentelemetry.io/otel/exporters/jaeger v1.14.0
76+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0
77+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0
79+
go.opentelemetry.io/otel/sdk v1.14.0
80+
go.opentelemetry.io/otel/trace v1.14.0
8181
go.opentelemetry.io/proto/otlp v0.19.0
8282
golang.org/x/crypto v0.2.0
8383
golang.org/x/net v0.7.0
8484
golang.org/x/sync v0.1.0
85-
golang.org/x/sys v0.5.0
85+
golang.org/x/sys v0.6.0
8686
golang.org/x/time v0.1.0
87-
google.golang.org/genproto v0.0.0-20230131230820-1c016267d619
88-
google.golang.org/grpc v1.52.3
87+
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
88+
google.golang.org/grpc v1.53.0
8989
google.golang.org/protobuf v1.28.1
9090
kernel.org/pub/linux/libs/security/libcap/cap v1.2.67
9191
)
9292

9393
require (
94-
cloud.google.com/go/compute v1.14.0 // indirect
9594
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
9695
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 // indirect
9796
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.0 // indirect
@@ -112,10 +111,10 @@ require (
112111
github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 // indirect
113112
github.com/beorn7/perks v1.0.1 // indirect
114113
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
115-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
114+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
116115
github.com/containerd/cgroups v1.1.0 // indirect
117-
github.com/containerd/fifo v1.0.0 // indirect
118-
github.com/containerd/ttrpc v1.1.1-0.20230127163717-32fab2374638 // indirect
116+
github.com/containerd/fifo v1.1.0 // indirect
117+
github.com/containerd/ttrpc v1.2.1 // indirect
119118
github.com/containernetworking/cni v1.1.2 // indirect
120119
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
121120
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
@@ -130,7 +129,7 @@ require (
130129
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
131130
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
132131
github.com/google/uuid v1.3.0 // indirect
133-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
132+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
134133
github.com/hanwen/go-fuse/v2 v2.1.1-0.20220112183258-f57e95bda82d // indirect
135134
github.com/hashicorp/errwrap v1.1.0 // indirect
136135
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -151,8 +150,8 @@ require (
151150
github.com/shibumi/go-pathspec v1.3.0 // indirect
152151
github.com/vbatts/tar-split v0.11.2 // indirect
153152
go.opencensus.io v0.24.0 // indirect
154-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect
155-
go.opentelemetry.io/otel/metric v0.34.0 // indirect
153+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
154+
go.opentelemetry.io/otel/metric v0.37.0 // indirect
156155
golang.org/x/mod v0.7.0 // indirect
157156
golang.org/x/text v0.7.0 // indirect
158157
golang.org/x/tools v0.5.0 // indirect

0 commit comments

Comments
 (0)