From 06492999086798042135dc87b37d5eb6e682716a Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 22 Jun 2016 10:12:18 -0400 Subject: [PATCH] Dont run man generation as part of test-unit. Signed-off-by: Daniel Nephin (cherry picked from commit 47cca88c8c151ebf3dd25adcf28ac1b2f75c76fb) Signed-off-by: Tibor Vass --- api/client/volume/create.go | 20 ++++++++++++++------ api/client/volume/inspect.go | 2 +- api/client/volume/list.go | 8 ++++++-- hack/make/test-unit | 1 + man/glide.lock | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/api/client/volume/create.go b/api/client/volume/create.go index f53eb30d22db7e39075ac803eb173458e7968ed2..97ed064f9790380ce739bff8c8ed5630f6be6215 100644 --- a/api/client/volume/create.go +++ b/api/client/volume/create.go @@ -63,27 +63,35 @@ func runCreate(dockerCli *client.DockerCli, opts createOptions) error { } var createDescription = ` -Creates a new volume that containers can consume and store data in. If a name is not specified, Docker generates a random name. You create a volume and then configure the container to use it, for example: +Creates a new volume that containers can consume and store data in. If a name +is not specified, Docker generates a random name. You create a volume and then +configure the container to use it, for example: $ docker volume create --name hello hello $ docker run -d -v hello:/world busybox ls /world -The mount is created inside the container's **/src** directory. Docker doesn't not support relative paths for mount points inside the container. +The mount is created inside the container's **/src** directory. Docker doesn't +not support relative paths for mount points inside the container. -Multiple containers can use the same volume in the same time period. This is useful if two containers need access to shared data. For example, if one container writes and the other reads the data. +Multiple containers can use the same volume in the same time period. This is +useful if two containers need access to shared data. For example, if one +container writes and the other reads the data. ## Driver specific options -Some volume drivers may take options to customize the volume creation. Use the **-o** or **--opt** flags to pass driver options: +Some volume drivers may take options to customize the volume creation. Use the +**-o** or **--opt** flags to pass driver options: $ docker volume create --driver fake --opt tardis=blue --opt timey=wimey -These options are passed directly to the volume driver. Options for different volume drivers may do different things (or nothing at all). +These options are passed directly to the volume driver. Options for different +volume drivers may do different things (or nothing at all). The built-in **local** driver on Windows does not support any options. -The built-in **local** driver on Linux accepts options similar to the linux **mount** command: +The built-in **local** driver on Linux accepts options similar to the linux +**mount** command: $ docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 diff --git a/api/client/volume/inspect.go b/api/client/volume/inspect.go index 5cf8fb442388aea160eb4174107ea4517f47f13c..7e310a5783f66e2a5a78bc88012d9bd0a4097d3b 100644 --- a/api/client/volume/inspect.go +++ b/api/client/volume/inspect.go @@ -49,7 +49,7 @@ func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error { var inspectDescription = ` Returns information about one or more volumes. By default, this command renders all results in a JSON array. You can specify an alternate format to execute a -given template is executed for each result. Go's http://golang.org/pkg/text/template/ +given template is executed for each result. Go's https://golang.org/pkg/text/template/ package describes all the details of the format. ` diff --git a/api/client/volume/list.go b/api/client/volume/list.go index 8e5f51fc76580425c7189348fde976aa710e46bf..0cebe4d5566604af60fb86582a1294b4c0d4874d 100644 --- a/api/client/volume/list.go +++ b/api/client/volume/list.go @@ -88,8 +88,12 @@ func runList(dockerCli *client.DockerCli, opts listOptions) error { var listDescription = ` -Lists all the volumes Docker knows about. You can filter using the **-f** or **--filter** flag. The filtering format is a **key=value** pair. To specify more than one filter, pass multiple flags (for example, **--filter "foo=bar" --filter "bif=baz"**) +Lists all the volumes Docker knows about. You can filter using the **-f** or +**--filter** flag. The filtering format is a **key=value** pair. To specify +more than one filter, pass multiple flags (for example, +**--filter "foo=bar" --filter "bif=baz"**) -There is a single supported filter **dangling=value** which takes a boolean of **true** or **false**. +There is a single supported filter **dangling=value** which takes a boolean of +**true** or **false**. ` diff --git a/hack/make/test-unit b/hack/make/test-unit index eee9789662afb8da7097daf911395affb3a06756..0761676798ae02561dd5a8c3dad6a148c454ab74 100644 --- a/hack/make/test-unit +++ b/hack/make/test-unit @@ -22,6 +22,7 @@ bundle_test_unit() { "${BUILDFLAGS[@]}" $TEST_PATH \ | grep github.com/docker/docker \ | grep -v github.com/docker/docker/vendor \ + | grep -v github.com/docker/docker/man \ | grep -v github.com/docker/docker/integration-cli) go test $COVER $GCCGOFLAGS -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list } diff --git a/man/glide.lock b/man/glide.lock index 0d34c2c5a96bb27a6dc36209d6b899f0e74347b3..40c5f5a64a6cfcb3ad9e38cc9723aaf81856f57d 100644 --- a/man/glide.lock +++ b/man/glide.lock @@ -48,5 +48,5 @@ imports: repo: https://github.com/dnephin/cobra subpackages: - doc - version: dc45219961f875acff5ee07ed263e5dc19e0c5f1 + version: v1.3 devImports: []