diff --git a/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch b/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch index 7361877bb..98334cdce 100644 --- a/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch +++ b/buildroot-patches/0003-docker-engine-add-AppArmor-support.patch @@ -1,15 +1,15 @@ -From 4339c40ac56d11069adc4535ed2f220e5be60de5 Mon Sep 17 00:00:00 2001 +From 93c43e8572d374edbea8521f63c071a0a5cb1098 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli -Date: Mon, 31 Dec 2018 00:32:24 +0000 +Date: Thu, 3 Jan 2019 19:54:57 +0000 Subject: [PATCH 1/1] docker-engine: add AppArmor support Signed-off-by: Pascal Vizeli --- - package/docker-engine/docker-engine.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + package/docker-engine/docker-engine.mk | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk -index f19c1d9..0c6a04a 100644 +index f19c1d9..9ecfd10 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \ @@ -21,6 +21,17 @@ index f19c1d9..0c6a04a 100644 DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +@@ -77,4 +77,10 @@ define DOCKER_ENGINE_USERS + - - docker -1 * - - - Docker Application Container Framework + endef + ++define DOCKER_ENGINE_INSTALL_SYMLINKS ++ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init ++endef ++ ++DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS ++ + $(eval $(golang-package)) -- 2.17.1 diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index 0c6a04aa4..9ecfd1013 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -77,4 +77,10 @@ define DOCKER_ENGINE_USERS - - docker -1 * - - - Docker Application Container Framework endef +define DOCKER_ENGINE_INSTALL_SYMLINKS + ln -fs tini $(TARGET_DIR)/usr/bin/docker-init +endef + +DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS + $(eval $(golang-package))