Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion containerd-1.7
2 changes: 1 addition & 1 deletion containerd-2.2
2 changes: 1 addition & 1 deletion containerd-main
Submodule containerd-main updated 81 files
+1 −1 .devcontainer/devcontainer.json
+1 −1 .github/workflows/api-release.yml
+1 −1 .github/workflows/ci.yml
+1 −1 .github/workflows/release/Dockerfile
+1 −2 api/go.mod
+6 −16 api/go.sum
+225 −35 api/next.txtpb
+52 −29 api/runtime/bootstrap/v1/bootstrap.pb.go
+11 −0 api/runtime/bootstrap/v1/bootstrap.proto
+36 −3 api/runtime/bootstrap/v1/helpers.go
+73 −0 api/runtime/bootstrap/v1/helpers_test.go
+104 −13 api/types/mount.pb.go
+24 −0 api/types/mount.proto
+1 −1 contrib/Dockerfile.test
+2 −2 contrib/fuzz/oss_fuzz_build.sh
+27 −5 core/mount/manager.go
+15 −71 core/mount/manager/manager.go
+149 −0 core/mount/manager/plan.go
+230 −0 core/mount/manager/plan_test.go
+50 −0 core/mount/manager_test.go
+10 −13 core/runtime/v2/binary.go
+159 −0 core/runtime/v2/command.go
+27 −0 core/runtime/v2/command_unix.go
+23 −0 core/runtime/v2/command_windows.go
+102 −32 core/runtime/v2/shim.go
+22 −40 core/runtime/v2/shim_manager.go
+59 −0 core/runtime/v2/shim_manager_test.go
+153 −19 core/runtime/v2/shim_test.go
+78 −54 core/runtime/v2/task_manager.go
+149 −0 core/runtime/v2/task_mounts.go
+146 −0 core/runtime/v2/task_mounts_deprecated.go
+212 −0 core/runtime/v2/task_mounts_deprecated_test.go
+305 −0 core/runtime/v2/task_mounts_test.go
+24 −9 docs/mounts.md
+8 −4 docs/runtime-v2.md
+63 −0 docs/shim-capabilities.md
+7 −5 go.mod
+10 −59 go.sum
+135 −12 integration/issue7496_shutdown_linux_test.go
+0 −2 pkg/shim/shim.go
+0 −122 pkg/shim/util.go
+0 −6 pkg/shim/util_unix.go
+0 −5 pkg/shim/util_windows.go
+4 −2 pkg/tracing/helpers.go
+88 −0 pkg/tracing/helpers_test.go
+28 −0 plugins/diff/erofs/differ.go
+16 −2 plugins/snapshots/erofs/erofs.go
+50 −0 plugins/snapshots/erofs/metrics.go
+1 −1 script/setup/prepare_env_windows.ps1
+1 −1 script/vm/provision.sh
+0 −191 vendor/github.com/containerd/containerd/api/LICENSE
+52 −29 vendor/github.com/containerd/containerd/api/runtime/bootstrap/v1/bootstrap.pb.go
+11 −0 vendor/github.com/containerd/containerd/api/runtime/bootstrap/v1/bootstrap.proto
+36 −3 vendor/github.com/containerd/containerd/api/runtime/bootstrap/v1/helpers.go
+104 −13 vendor/github.com/containerd/containerd/api/types/mount.pb.go
+24 −0 vendor/github.com/containerd/containerd/api/types/mount.proto
+14 −7 vendor/github.com/containerd/go-runc/.golangci.yml
+5 −11 vendor/github.com/containerd/go-runc/README.md
+1 −1 vendor/github.com/containerd/go-runc/command_linux.go
+1 −1 vendor/github.com/containerd/go-runc/command_other.go
+23 −0 vendor/github.com/containerd/go-runc/io_linux.go
+25 −0 vendor/github.com/containerd/go-runc/io_nolinux.go
+12 −31 vendor/github.com/containerd/go-runc/io_unix.go
+1 −1 vendor/github.com/containerd/go-runc/monitor.go
+11 −5 vendor/github.com/containerd/go-runc/runc.go
+5 −5 vendor/github.com/containerd/go-runc/socket.go
+0 −425 vendor/github.com/docker/go-metrics/LICENSE.docs
+42 −32 vendor/github.com/docker/go-metrics/README.md
+4 −0 vendor/github.com/docker/go-metrics/counter.go
+2 −1 vendor/github.com/docker/go-metrics/docs.go
+4 −0 vendor/github.com/docker/go-metrics/gauge.go
+33 −39 vendor/github.com/docker/go-metrics/handler.go
+129 −85 vendor/github.com/docker/go-metrics/namespace.go
+4 −4 vendor/github.com/docker/go-metrics/register.go
+4 −0 vendor/github.com/docker/go-metrics/timer.go
+7 −0 vendor/github.com/sirupsen/logrus/CHANGELOG.md
+6 −0 vendor/google.golang.org/grpc/internal/transport/http2_server.go
+1 −1 vendor/google.golang.org/grpc/version.go
+8 −7 vendor/modules.txt
+37 −41 vendor/tags.cncf.io/container-device-interface/pkg/cdi/cache.go
+7 −5 vendor/tags.cncf.io/container-device-interface/pkg/cdi/spec.go
Loading