From 53aff7f049c974ab861db563c24d31c5512d1fbc Mon Sep 17 00:00:00 2001 Message-Id: <53aff7f049c974ab861db563c24d31c5512d1fbc.1612369715.git.stefan@agner.ch> From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:27:06 +0000 Subject: [PATCH 1/9] docker: add AppArmor support Signed-off-by: Pascal Vizeli Signed-off-by: Stefan Agner --- package/docker-containerd/docker-containerd.mk | 5 +++++ package/docker-engine/docker-engine.mk | 5 +++++ package/runc/runc.mk | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 6b79bd14ae..2eed6e346b 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -18,6 +18,11 @@ DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim +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 diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 8cedf307ba..7f898680b7 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -20,6 +20,11 @@ DOCKER_ENGINE_LDFLAGS = \ DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +DOCKER_ENGINE_DEPENDENCIES += libapparmor +DOCKER_ENGINE_TAGS += apparmor +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_TAGS += seccomp DOCKER_ENGINE_DEPENDENCIES += libseccomp diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 393bd7b22f..45fe1442ad 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -12,6 +12,11 @@ RUNC_LICENSE_FILES = LICENSE RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +RUNC_DEPENDENCIES += libapparmor +RUNC_TAGS += apparmor +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf -- 2.30.0