From 81bf3979ac5aec0dd8d4bccc690fe1bcef5de139 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 13 Jan 2020 12:30:48 +0000 Subject: [PATCH 1/1] Docker: tini & static Signed-off-by: Pascal Vizeli --- package/docker-engine/docker-engine.mk | 6 ++++++ package/tini/tini.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 14673f3183..b0eaae9580 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -82,4 +82,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)) diff --git a/package/tini/tini.mk b/package/tini/tini.mk index 132bfc99dd..b6d7d80b22 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE TINI_CFLAGS = $(TARGET_CFLAGS) \ -DTINI_VERSION=\"$(TINI_VERSION)\" \ -DTINI_GIT=\"\" +TINI_CFLAGS += -static ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y) TINI_CFLAGS += -DTINI_MINIMAL -- 2.17.1