From de338473e16b942624343d7013e2fece309f4897 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 12 Apr 2019 19:04:12 +0200 Subject: [PATCH] compose-file: remove reference to custom init path (#8628) * compose-file: remove reference to custom init path This option was never functional, and was not intended to be added to the "container create" API, so let's remove it, because it has been removed in Docker 17.05, and was broken in versions before that; see - docker/docker-py#2309 Remove init_path from create - moby/moby#32355 --init-path does not seem to work - moby/moby#32470 remove --init-path from client Signed-off-by: Sebastiaan van Stijn * Update index.md --- compose/compose-file/compose-file-v2.md | 12 +++++------- compose/compose-file/index.md | 14 +++++--------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md index 5867968a25..6ee0c66246 100644 --- a/compose/compose-file/compose-file-v2.md +++ b/compose/compose-file/compose-file-v2.md @@ -738,8 +738,7 @@ options and tags it with the specified tag. > [Added in version 2.2 file format](compose-versioning.md#version-22). Run an init inside the container that forwards signals and reaps processes. -Either set a boolean value to use the default `init`, or specify a path to -a custom one. +Set this option to `true` to enable this feature for the service. version: "{{ site.compose_file_v2 }}" services: @@ -747,12 +746,11 @@ a custom one. image: alpine:latest init: true +> The default init binary that is used is [Tini](https://github.com/krallin/tini), +> and is installed in `/usr/libexec/docker-init` on the daemon host. You can +> configure the daemon to use a custom init binary through the +> [`init-path` configuration option](/engine/reference/commandline/dockerd/#daemon-configuration-file). - version: "{{ site.compose_file_v2 }}" - services: - web: - image: alpine:latest - init: /usr/libexec/docker-init ### isolation diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index f30b340823..6b045ddf26 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -1255,8 +1255,7 @@ options and tags it with the specified tag. > [Added in version 3.7 file format](compose-versioning.md#version-37). Run an init inside the container that forwards signals and reaps processes. -Either set a boolean value to use the default `init`, or specify a path to -a custom one. +Set this option to `true` to enable this feature for the service. ```yaml version: "{{ site.compose_file_v3 }}" @@ -1266,13 +1265,10 @@ services: init: true ``` -```yaml -version: '2.2' -services: - web: - image: alpine:latest - init: /usr/libexec/docker-init -``` +> The default init binary that is used is [Tini](https://github.com/krallin/tini), +> and is installed in `/usr/libexec/docker-init` on the daemon host. You can +> configure the daemon to use a custom init binary through the +> [`init-path` configuration option](/engine/reference/commandline/dockerd/#daemon-configuration-file). ### isolation