From 41fa4de12ede92b7b922137045268f8f5494ea0f Mon Sep 17 00:00:00 2001 From: Ethan Haynes Date: Fri, 19 Jan 2018 21:52:14 -0600 Subject: [PATCH] added doc changes for upcoming tmpfs-mode 3.6 compose Signed-off-by: Ethan Haynes --- compose/compose-file/compose-versioning.md | 10 ++++++++++ compose/compose-file/index.md | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md index 8cddea9aa557..fb5353827e00 100644 --- a/compose/compose-file/compose-versioning.md +++ b/compose/compose-file/compose-versioning.md @@ -277,6 +277,16 @@ Introduces the following additional parameters: - `name` for networks, secrets and configs - `shm_size` in [build configurations](index.md#build) +### Version 3.6 + +An upgrade of [version 3](#version-3) that introduces new parameters. It is +only available with Docker Engine version **17.12.0** and higher. + +Introduces the following additional parameters: + +- [`tmpfs`](index.md#tmpfs) in volume definitions using the [Long Syntax](index.md#long-syntax-3) +- `size` optional parameter for a tmpfs volume + ## Upgrading ### Version 2.x to 3.x diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index b6039d9b9b19..9e28e817e1be 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -881,7 +881,17 @@ Mount a temporary file system inside the container. Can be a single value or a l > **Note**: This option is ignored when > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md) -> with a (version 3) Compose file. +> with a (version 3-3.5) Compose file. + +> [Version 3.6 file format](compose-versioning.md#version-3) and up. + +Mount a temporary file system inside the container. Size parameter specifies the size +of the tmpfs mount in bytes. Unlimited by default. + + - type: tmpfs + target: /app + tmpfs: + size: 1000 ### entrypoint