05ba57e006
Bump Docker to latest release 20.10.6. Also make sure to upgrade docker-proxy with various IPv6 releated features and fixes.
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 9c98c07abbe9ee675ec588ad7c15f0285e8a0f07 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch>
|
|
From: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Date: Mon, 13 Jan 2020 12:27:06 +0000
|
|
Subject: [PATCH 1/9] docker: add AppArmor support
|
|
|
|
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
package/docker-containerd/docker-containerd.mk | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
|
|
index e229d9cb54..e968518a69 100644
|
|
--- a/package/docker-containerd/docker-containerd.mk
|
|
+++ b/package/docker-containerd/docker-containerd.mk
|
|
@@ -30,6 +30,11 @@ DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
|
|
DOCKER_CONTAINERD_TAGS += apparmor
|
|
endif
|
|
|
|
+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
|
|
+DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
|
|
+DOCKER_CONTAINERD_TAGS += apparmor
|
|
+endif
|
|
+
|
|
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
|
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
|
|
DOCKER_CONTAINERD_TAGS += seccomp
|
|
--
|
|
2.31.1
|
|
|