From 93ce3bbcf565e98699be6b4115e7684118dbe3cb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 11 Apr 2019 10:43:26 +0200 Subject: [PATCH 1/2] 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 --- compose/compose-file/compose-file-v2.md | 13 +++++-------- compose/compose-file/index.md | 14 +++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md index fbd903d624f0..063fb5a827c3 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: '2.2' services: @@ -747,12 +746,10 @@ a custom one. image: alpine:latest init: true - - 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 diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index 1270fcc8f337..5f3a2e2337bc 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -1252,8 +1252,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: '3.7' @@ -1263,13 +1262,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 From aa3d56993ba7d3c421ac287f39aa9fbb1c741ae0 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Fri, 12 Apr 2019 19:03:27 +0200 Subject: [PATCH 2/2] Update index.md --- compose/compose-file/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index da0a82ff5c23..6b045ddf26bc 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -1268,7 +1268,7 @@ services: > 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) +> [`init-path` configuration option](/engine/reference/commandline/dockerd/#daemon-configuration-file). ### isolation