From 61ee847247552cac963500b9c09f5f233d75b08a Mon Sep 17 00:00:00 2001 From: bjmmedeiros <1548442+bjmmedeiros@users.noreply.github.com> Date: Mon, 19 Jul 2021 00:24:53 -0300 Subject: [PATCH 1/4] Update spec.md Trivial typo fix: MUTS -> MUST Signed-off-by: bjmmedeiros <1548442+bjmmedeiros@users.noreply.github.com> --- spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.md b/spec.md index 5f1d0e12..00cd0219 100644 --- a/spec.md +++ b/spec.md @@ -1635,7 +1635,7 @@ secrets: ``` Services MAY be granted access to multiple secrets. Long and short syntax for secrets MAY be used in the -same Compose file. Defining a secret in the top-level `secrets` MUTS NOT imply granting any service access to it. +same Compose file. Defining a secret in the top-level `secrets` MUST NOT imply granting any service access to it. Such grant must be explicit within service specification as [secrets](#secrets) service element. ### security_opt From 1491eafa9344e6fc485c62e3f942fc87e03bf8da Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Wed, 4 Aug 2021 15:59:02 +0200 Subject: [PATCH 2/4] Allow use of plain boolean as environment values Signed-off-by: Nicolas De Loof --- schema/compose-spec.json | 2 +- spec.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/compose-spec.json b/schema/compose-spec.json index 2ce8da4a..8891fc42 100644 --- a/schema/compose-spec.json +++ b/schema/compose-spec.json @@ -770,7 +770,7 @@ "type": "object", "patternProperties": { ".+": { - "type": ["string", "number", "null"] + "type": ["string", "number", "boolean", "null"] } }, "additionalProperties": false diff --git a/spec.md b/spec.md index 5f1d0e12..4932e287 100644 --- a/spec.md +++ b/spec.md @@ -754,7 +754,7 @@ VAR="quoted" ### environment `environment` defines environment variables set in the container. `environment` can use either an array or a -map. Any boolean values; true, false, yes, no, MUST be enclosed in quotes to ensure +map. Any boolean values; true, false, yes, no, SHOULD be enclosed in quotes to ensure they are not converted to True or False by the YAML parser. Environment variables MAY be declared by a single key (no value to equals sign). In such a case Compose From 4f68f6d7155473221ca193d7e33e0477100ba048 Mon Sep 17 00:00:00 2001 From: Andrew Meredith Date: Thu, 2 Sep 2021 15:43:17 -0600 Subject: [PATCH 3/4] Update spec to use colon-separated There were two references to strings that are "comma-separated", but the docs continue to describe the delimiter as actually being a colon. This updates the prose to reference the correct punctuation mark. Signed-off-by: Andrew Meredith --- spec.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec.md b/spec.md index 4932e287..aa02a8c2 100644 --- a/spec.md +++ b/spec.md @@ -1448,7 +1448,7 @@ Port mapping MUST NOT be used with `network_mode: host` and doing so MUST result #### Short syntax -The short syntax is a comma-separated string to set host IP, host port and container port +The short syntax is a colon-separated string to set host IP, host port and container port in the form: `[HOST:]CONTAINER[/PROTOCOL]` where: @@ -1788,7 +1788,7 @@ volumes: #### Short syntax -The short syntax uses a single string with comma-separated values to specify a volume mount +The short syntax uses a single string with colon-separated values to specify a volume mount (`VOLUME:CONTAINER_PATH`), or an access mode (`VOLUME:CONTAINER:ACCESS_MODE`). `VOLUME` MAY be either a host path on the platform hosting containers (bind mount) or a volume name. From e418731827a0a467708953d35f26449d54557c9a Mon Sep 17 00:00:00 2001 From: Michael Lutaaya Date: Wed, 21 Jul 2021 20:35:43 -0400 Subject: [PATCH 4/4] Fix typo in image section of Compose spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `sha356` → `sha256` Signed-off-by: Michael Lutaaya --- spec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec.md b/spec.md index 4932e287..6c42e3b4 100644 --- a/spec.md +++ b/spec.md @@ -1097,7 +1097,7 @@ as `[/][/][:|@]`. ```yml image: redis image: redis:5 - image: redis@sha356:0ed5d5928d4737458944eb604cc8509e245c3e19d02ad83935398bc4b991aac7 + image: redis@sha256:0ed5d5928d4737458944eb604cc8509e245c3e19d02ad83935398bc4b991aac7 image: library/redis image: docker.io/library/redis image: my_private.registry:5000/redis