Build and symlink balena-containerd-shim-runc-v2

This also removes the old shim (balena-engine-containerd-shim), which we are replacing with the new balena-containerd-shim-runc-v2.
balena-os · Aug 30, 2023 · a0425a0 · a0425a0
1 parent cd0ca50
commit a0425a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/balena-engine/main.go b/cmd/balena-engine/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/cmd/containerd"
-	containerdShim "github.com/containerd/containerd/cmd/containerd-shim"
+	containerdShimRuncV2 "github.com/containerd/containerd/cmd/containerd-shim-runc-v2"
 	"github.com/containerd/containerd/cmd/ctr"
 	"github.com/docker/cli/cmd/docker"
 	"github.com/docker/docker/cmd/dockerd"
@@ -30,8 +30,8 @@ func main() {
 		dockerd.Main()
 	case "balena-containerd", "balena-engine-containerd":
 		containerd.Main()
-	case "balena-containerd-shim", "balena-engine-containerd-shim":
-		containerdShim.Main()
+	case "balena-containerd-shim-runc-v2":
+		containerdShimRuncV2.Main()
 	case "balena-containerd-ctr", "balena-engine-containerd-ctr":
 		ctr.Main()
 	case "balena-runc", "balena-engine-runc":

diff --git a/hack/make/.binary-symlinks b/hack/make/.binary-symlinks
@@ -9,10 +9,10 @@ symlink_binaries() {
         balenad
         balena-engine-daemon
         balena-engine-containerd
-        balena-engine-containerd-shim
         balena-engine-containerd-ctr
         balena-engine-runc
         balena-engine-proxy
+        balena-containerd-shim-runc-v2
     )
 
     for file in "${binaries[@]}"; do