From f15a3a1c4ba123cc51d37ed67aa3ba72c02e0f37 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 17 Mar 2020 14:09:57 +0100 Subject: [PATCH] compose-file: use JSON notation for entrypoint example This format is also supported by YAML, and similar to how it's used in the Dockerfile. Signed-off-by: Sebastiaan van Stijn --- compose/compose-file/compose-file-v1.md | 8 +------- compose/compose-file/compose-file-v2.md | 8 +------- compose/compose-file/index.md | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/compose/compose-file/compose-file-v1.md b/compose/compose-file/compose-file-v1.md index 7a3aee3c5e..17e6a38b00 100644 --- a/compose/compose-file/compose-file-v1.md +++ b/compose/compose-file/compose-file-v1.md @@ -186,13 +186,7 @@ The entrypoint can also be a list, in a manner similar to [dockerfile](/engine/reference/builder.md#entrypoint): ```yaml -entrypoint: - - php - - -d - - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so - - -d - - memory_limit=-1 - - vendor/bin/phpunit +entrypoint: ["php", "-d", "memory_limit=-1", "vendor/bin/phpunit"] ``` > **Note**: Setting `entrypoint` both overrides any default entrypoint set diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md index 5c8a3453a8..5ce2b3a3ed 100644 --- a/compose/compose-file/compose-file-v2.md +++ b/compose/compose-file/compose-file-v2.md @@ -567,13 +567,7 @@ The entrypoint can also be a list, in a manner similar to [dockerfile](/engine/reference/builder.md#entrypoint): ```yaml -entrypoint: - - php - - -d - - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so - - -d - - memory_limit=-1 - - vendor/bin/phpunit +entrypoint: ["php", "-d", "memory_limit=-1", "vendor/bin/phpunit"] ``` > **Note** diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index f3338aa5b6..5e2204a55c 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -1011,13 +1011,7 @@ The entrypoint can also be a list, in a manner similar to [dockerfile](/engine/reference/builder.md#entrypoint): ```yaml -entrypoint: - - php - - -d - - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so - - -d - - memory_limit=-1 - - vendor/bin/phpunit +entrypoint: ["php", "-d", "memory_limit=-1", "vendor/bin/phpunit"] ``` > **Note**