Re-vendor to get the containerd-shim-runc-v2 sources

Including changes we did to make it work with balenaEngine's amalgamated binary. Signed-off-by: Leandro Motta Barros <[email protected]> Change-type: patch
balena-os · Sep 11, 2023 · 155b777 · 155b777
1 parent a0425a0
commit 155b777
Show file tree

Hide file tree

Showing 25 changed files with 2,315 additions and 520 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -131,7 +131,7 @@ github.com/googleapis/gax-go                        bd5b16380fd03dc758d11cef74ba
 google.golang.org/genproto                          e50cd9704f63023d62cd06a1994b98227fc4d21a
 
 # containerd
-github.com/containerd/containerd                    2412f5439937b966cdd7fa4a83656371254bdc4f https://github.com/balena-os/balena-containerd # 20.10.17-balena branch, equivalent to upstream's v1.6.6
+github.com/containerd/containerd                    3f37c5e44a31060155bd4ca26624032d6049b0d7 https://github.com/balena-os/balena-containerd # 20.10.17-balena branch (which is based on upstream's v1.6.6)
 github.com/containerd/fifo                          650e8a8a179d040123db61f016cb133143e7a581 # v1.0.0
 github.com/containerd/continuity                    092b2c8f580622aee465fd5d6aba1dc8fad58b56 # v0.2.2
 github.com/containerd/cgroups                       1df78138f1e1e6ee593db155c6b369466f577651 # v1.0.3

diff --git a/vendor/github.com/containerd/containerd/cmd/containerd-shim-runc-v2/main.go b/vendor/github.com/containerd/containerd/cmd/containerd-shim-runc-v2/main.go
diff --git a/vendor/github.com/containerd/containerd/cmd/containerd-shim/main_unix.go b/vendor/github.com/containerd/containerd/cmd/containerd-shim/main_unix.go