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.