Don't enable AppArmor if apparmor_parser is not present

This commit updates balena-containerd to a new version in which we cherry-picked the change from here: containerd/containerd#8086 This change avoids enabling AppArmor if the `/sbin/apparmor_parser` binary is not found in the system. Signed-off-by: Leandro Motta Barros <leandro@balena.io> Change-type: patch
balena-os · Aug 30, 2023 · ed8ba18 · ed8ba18
1 parent 2cd17c4
commit ed8ba18
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 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                    e427a4fa7dd076978806aead28ad563cf10d126a https://github.com/balena-os/balena-containerd # 20.10.17-balena branch, equivalent to upstream's v1.6.6
+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/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/pkg/apparmor/apparmor.go b/vendor/github.com/containerd/containerd/pkg/apparmor/apparmor.go
diff --git a/vendor/github.com/containerd/containerd/pkg/apparmor/apparmor_linux.go b/vendor/github.com/containerd/containerd/pkg/apparmor/apparmor_linux.go