jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 15:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS: Fix docker-init (#302)

Browse Source
This commit is contained in:
Pascal Vizeli 2019-01-03 21:47:44 +01:00 committed by GitHub
parent e0e87141c6
commit 2be8aecfbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
buildroot-patches/0003-docker-engine-add-AppArmor-support.patch
View File

@ -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 <pvizeli@syshack.ch> From: Pascal Vizeli <pvizeli@syshack.ch>
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 Subject: [PATCH 1/1] docker-engine: add AppArmor support
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
--- ---
package/docker-engine/docker-engine.mk | 2 +- package/docker-engine/docker-engine.mk | 8 +++++++-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk 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 --- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk
@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \ @@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \
@ -21,6 +21,17 @@ index f19c1d9..0c6a04a 100644
DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) 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 2.17.1

6
buildroot/package/docker-engine/docker-engine.mk
View File

@ -77,4 +77,10 @@ define DOCKER_ENGINE_USERS
- - docker -1 * - - - Docker Application Container Framework - - docker -1 * - - - Docker Application Container Framework
endef 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)) $(eval $(golang-package))