From cb97f6a9b32456b33e160afbc6677db089ad9412 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Feb 2025 11:33:46 +0100 Subject: [PATCH] package/docker-engine: carry the tini init symlink tini can be used standalone, not just as an init injected by docker. As such, creating the docker-engine's init symlink does not belong to tini itself, but to docker-engine. This will also help later, when we allow docker-engine to use another init alternative, catatonit (already paclkaged in Buildroot, but not integrated with docker). Signed-off-by: Yann E. MORIN Cc: Christian Stewart Cc: Fiona Klute (WIWA) Tested-by: Fiona Klute (WIWA) Signed-off-by: Julien Olivain --- package/docker-engine/docker-engine.mk | 8 ++++++++ package/tini/tini.mk | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index ba4e7a4ae0..7467f13b39 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,6 +35,14 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DOCKER_INIT),y) +define DOCKER_ENGINE_INIT + mkdir -p $(TARGET_DIR)/usr/libexec/docker + ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init +endef +DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INIT +endif + ifneq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif diff --git a/package/tini/tini.mk b/package/tini/tini.mk index 83e86237d4..c195c69023 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -31,8 +31,6 @@ endef define TINI_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini - mkdir -p $(TARGET_DIR)/usr/libexec/docker - ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init endef # Tini's CMakeLists.txt is not suitable for Buildroot.