@@ -34,6 +34,32 @@ config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
+choice
+ bool "docker-init to use"
+ default BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
+ help
+ The docker engine uses a minimal init process as PID 1
+ inside containers. There are several implementations
+ of this init process.
+
+config BR2_PACKAGE_DOCKER_ENGINE_INIT_TINI
+ bool "tini"
+ select BR2_PACKAGE_TINI
+ help
+ Use Tini as the container init process.
+
+ https://github.com/krallin/tini
+
+config BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT
+ bool "dumb-init"
+ select BR2_PACKAGE_DUMB_INIT
+ help
+ Use dumb-init as the container init process.
+
+ https://github.com/Yelp/dumb-init
+
+endchoice
+
config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
bool "btrfs filesystem driver"
depends on BR2_USE_MMU # btrfs-progs
@@ -63,6 +63,12 @@ endif
DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS))
+ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_INIT_DUMB_INIT),y)
+DOCKER_ENGINE_INSTALL_BINS += dumb-init
+else
+DOCKER_ENGINE_INSTALL_BINS += tini
+endif
+
define DOCKER_ENGINE_RUN_AUTOGEN
cd $(@D) && \
GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
When a docker container is run with the --init flag, the Docker engine uses the docker-init binary as PID 1 inside the container. This is necessary in may cases to avoid issues with signal handling, zombie processes, and other quirks when running as PID 1. The docker-init binary is backed by tini on default, but optionally can be changed to docker-init by user preference. Furthermore, this patch fixes the following Docker error: dockerd: level=warning msg="failed to retrieve docker-init version" Signed-off-by: Christian Stewart <christian@paral.in> --- package/docker-engine/Config.in | 26 ++++++++++++++++++++++++++ package/docker-engine/docker-engine.mk | 6 ++++++ 2 files changed, 32 insertions(+)