From c7c45c24a8e9f6620ba94ae26a691f512d162403 Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Tue, 10 Nov 2015 15:25:53 +0000 Subject: [PATCH 1/2] Add docs and man page entry for --volume-driver Signed-off-by: Ben Firshman Upstream-commit: fe3ec3f77fd71d8544bc640b3d91f563f7d68013 Component: engine --- components/engine/docs/reference/commandline/create.md | 1 + components/engine/docs/reference/commandline/run.md | 1 + components/engine/man/docker-create.1.md | 8 ++++++++ components/engine/man/docker-run.1.md | 10 +++++++++- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/components/engine/docs/reference/commandline/create.md b/components/engine/docs/reference/commandline/create.md index df41ccb75f..8cddf9288f 100644 --- a/components/engine/docs/reference/commandline/create.md +++ b/components/engine/docs/reference/commandline/create.md @@ -83,6 +83,7 @@ Creates a new container. If 'host-src' is missing, then docker creates a new volume. If neither 'rw' or 'ro' is specified then the volume is mounted in read-write mode. + --volume-driver="" Optional volume driver for the container --volumes-from=[] Mount volumes from the specified container(s) -w, --workdir="" Working directory inside the container diff --git a/components/engine/docs/reference/commandline/run.md b/components/engine/docs/reference/commandline/run.md index 4841384681..394c640183 100644 --- a/components/engine/docs/reference/commandline/run.md +++ b/components/engine/docs/reference/commandline/run.md @@ -84,6 +84,7 @@ parent = "smn_cli" If 'host-src' is missing, then docker creates a new volume. If neither 'rw' or 'ro' is specified then the volume is mounted in read-write mode. + --volume-driver="" Optional volume driver for the container --volumes-from=[] Mount volumes from the specified container(s) -w, --workdir="" Working directory inside the container diff --git a/components/engine/man/docker-create.1.md b/components/engine/man/docker-create.1.md index 1e1d2df6f7..9e946f8c3f 100644 --- a/components/engine/man/docker-create.1.md +++ b/components/engine/man/docker-create.1.md @@ -63,6 +63,7 @@ docker-create - Create a new container [**--ulimit**[=*[]*]] [**--uts**[=*[]*]] [**-v**|**--volume**[=*[]*]] +[**--volume-driver**[=*DRIVER*]] [**--volumes-from**[=*[]*]] [**-w**|**--workdir**[=*WORKDIR*]] IMAGE [COMMAND] [ARG...] @@ -305,6 +306,13 @@ any options, the systems uses the following options: **-v**, **--volume**=[] Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container) +**--volume-driver**="" + Optional volume driver for the container + + If the container has a volume either from the `VOLUME` instruction in a + Dockerfile or the `-v` flag, a driver can be specified to create the volumes + with. See **docker-volume-create(1)** for full details. + **--volumes-from**=[] Mount volumes from the specified container(s) diff --git a/components/engine/man/docker-run.1.md b/components/engine/man/docker-run.1.md index a423d55fac..3db446240f 100644 --- a/components/engine/man/docker-run.1.md +++ b/components/engine/man/docker-run.1.md @@ -63,9 +63,10 @@ docker-run - Run a command in a new container [**-t**|**--tty**[=*false*]] [**--tmpfs**[=*[CONTAINER-DIR[:]*]] [**-u**|**--user**[=*USER*]] -[**-v**|**--volume**[=*[]*]] [**--ulimit**[=*[]*]] [**--uts**[=*[]*]] +[**-v**|**--volume**[=*[]*]] +[**--volume-driver**[=*DRIVER*]] [**--volumes-from**[=*[]*]] [**-w**|**--workdir**[=*WORKDIR*]] IMAGE [COMMAND] [ARG...] @@ -512,6 +513,13 @@ For example, you can specify either `/foo` or `foo` for a `host-dir` value. If you supply the `/foo` value, Docker creates a bind-mount. If you supply the `foo` specification, Docker creates a named volume. +**--volume-driver**="" + Optional volume driver for the container + + If the container has a volume either from the `VOLUME` instruction in a + Dockerfile or the `-v` flag, a driver can be specified to create the volumes + with. See **docker-volume-create(1)** for full details. + **--volumes-from**=[] Mount volumes from the specified container(s) From 476079ebd7cec860fab8cb20fed3751f178b3684 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 3 Dec 2015 16:07:54 +0100 Subject: [PATCH 2/2] Address review comments. Signed-off-by: Sebastiaan van Stijn Upstream-commit: a2120e5ba3337f70a63fd64ea773e50ce5af31ca Component: engine --- components/engine/docs/reference/commandline/create.md | 2 +- components/engine/docs/reference/commandline/run.md | 2 +- components/engine/man/docker-create.1.md | 8 +++----- components/engine/man/docker-run.1.md | 8 +++----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/components/engine/docs/reference/commandline/create.md b/components/engine/docs/reference/commandline/create.md index 8cddf9288f..f05c2d00dc 100644 --- a/components/engine/docs/reference/commandline/create.md +++ b/components/engine/docs/reference/commandline/create.md @@ -83,7 +83,7 @@ Creates a new container. If 'host-src' is missing, then docker creates a new volume. If neither 'rw' or 'ro' is specified then the volume is mounted in read-write mode. - --volume-driver="" Optional volume driver for the container + --volume-driver="" Container's volume driver --volumes-from=[] Mount volumes from the specified container(s) -w, --workdir="" Working directory inside the container diff --git a/components/engine/docs/reference/commandline/run.md b/components/engine/docs/reference/commandline/run.md index 394c640183..7015991ea6 100644 --- a/components/engine/docs/reference/commandline/run.md +++ b/components/engine/docs/reference/commandline/run.md @@ -84,7 +84,7 @@ parent = "smn_cli" If 'host-src' is missing, then docker creates a new volume. If neither 'rw' or 'ro' is specified then the volume is mounted in read-write mode. - --volume-driver="" Optional volume driver for the container + --volume-driver="" Container's volume driver --volumes-from=[] Mount volumes from the specified container(s) -w, --workdir="" Working directory inside the container diff --git a/components/engine/man/docker-create.1.md b/components/engine/man/docker-create.1.md index 9e946f8c3f..362eef7474 100644 --- a/components/engine/man/docker-create.1.md +++ b/components/engine/man/docker-create.1.md @@ -307,11 +307,9 @@ any options, the systems uses the following options: Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container) **--volume-driver**="" - Optional volume driver for the container - - If the container has a volume either from the `VOLUME` instruction in a - Dockerfile or the `-v` flag, a driver can be specified to create the volumes - with. See **docker-volume-create(1)** for full details. + Container's volume driver. This driver creates volumes specified either from + a Dockerfile's `VOLUME` instruction or from the `docker run -v` flag. + See **docker-volume-create(1)** for full details. **--volumes-from**=[] Mount volumes from the specified container(s) diff --git a/components/engine/man/docker-run.1.md b/components/engine/man/docker-run.1.md index 3db446240f..5ee9dea044 100644 --- a/components/engine/man/docker-run.1.md +++ b/components/engine/man/docker-run.1.md @@ -514,11 +514,9 @@ If you supply the `/foo` value, Docker creates a bind-mount. If you supply the `foo` specification, Docker creates a named volume. **--volume-driver**="" - Optional volume driver for the container - - If the container has a volume either from the `VOLUME` instruction in a - Dockerfile or the `-v` flag, a driver can be specified to create the volumes - with. See **docker-volume-create(1)** for full details. + Container's volume driver. This driver creates volumes specified either from + a Dockerfile's `VOLUME` instruction or from the `docker run -v` flag. + See **docker-volume-create(1)** for full details. **--volumes-from**=[] Mount volumes from the specified container(s)