Граф коммитов

25835 Коммитов

Автор SHA1 Сообщение Дата
Daniel Nephin 25e9b06ac0 Set Long text for volume commands so they can be used to generate man pages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:21 -04:00
Daniel Nephin 00a8a40398 Add a script to generate man pages from cobra commands.
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:21 -04:00
Vincent Demeester 6875f71d7c Merge pull request #24776 from anusha-ragunathan/plugins-connect
Add only legacy plugins to the legacy lookup map.
2016-07-19 17:11:50 +02:00
Daniel Nephin 68e52febde Merge pull request #24722 from thaJeztah/update-usage-for-deprecated-flags
Don't automagically add "[OPTIONS]" to usage
2016-07-19 11:01:33 -04:00
Sebastiaan van Stijn be2e2fca08 Merge pull request #24791 from albers/completion-node-update-labels
bash completion for `docker node update --label-{add,rm}`
2016-07-19 15:22:29 +02:00
Sebastiaan van Stijn ebca26b4b1 Merge pull request #24792 from albers/completion-service-log-drivers
bash completion for `docker service {create,update} --log-{driver,opt}`
2016-07-19 15:19:55 +02:00
Phil Estes 8a766b859f Merge pull request #24741 from dsau/24704-create-zfs-directory
Create zfs directory if it doesn't exist at startup.
2016-07-19 13:22:54 +01:00
Harald Albers 823e161de7 bash completion for `docker service {create,update} --log-{driver,opt}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:20:40 +02:00
Harald Albers bc6e3c0b5e bash completion for `docker node update --label-{add,rm}`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:09:28 +02:00
Lei Jitang 5c53fd468b Merge pull request #24784 from doronp/UseHTTPCodes
Use const http status code instead of just numbers see #24783
2016-07-19 19:02:42 +08:00
Vincent Demeester cf8f2a5037 Merge pull request #24747 from thaJeztah/bump-golang-to-1.6.3
Bump Go to 1.6.3
2016-07-19 09:42:25 +02:00
Doron Podoleanu 6bec735c91 Use const http status code instead of just numbers see #24783
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
2016-07-19 10:40:20 +03:00
Sebastiaan van Stijn 5fe3e006e4 Merge pull request #24782 from tonistiigi/load-sec
Update docker load security docs
2016-07-19 09:06:27 +02:00
Sebastiaan van Stijn dc0d6040e4 Merge pull request #24397 from dongluochen/nodelabels
support node label update
2016-07-19 07:55:24 +02:00
Brian Goff f49fdb9d0b Merge pull request #24755 from thaJeztah/fix-error-message
update "image delete" error to match actual behavior
2016-07-18 22:47:55 -04:00
Tonis Tiigi f17469e890 Update docker load security docs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-18 19:16:15 -07:00
Tibor Vass 1796680381 Merge pull request #24476 from stevvooe/services-log-driver-support
swarm: add log driver support for services
2016-07-18 19:08:12 -07:00
Dong Chen e1165cdfd1 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-07-18 18:39:52 -07:00
Damian Smyth 205bc6fc99 Create zfs directory if it doesn't exist at startup.
Signed-off-by: Damian Smyth <damian@dsau.co>
2016-07-19 10:12:22 +10:00
Tibor Vass e6a97db2c9 Merge pull request #23878 from jstarks/fix_windows_console
Windows: Always enable VT emulation
2016-07-18 16:23:04 -07:00
Sebastiaan van Stijn 340964db1c Merge pull request #24692 from anusha-ragunathan/plugins-ux
Print plugin name on successful install, enable and disable.
2016-07-19 01:09:35 +02:00
Anusha Ragunathan 8fd779dc28 Add only legacy plugins to the legacy lookup map.
Legacy plugin model maintained a map of plugins. This is
not used by the new model. Using this map in the new model
causes incorrect lookup of plugins. This change uses adds
a plugin to the map only if its legacy.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-18 15:43:44 -07:00
Sebastiaan van Stijn bceacfa57f Merge pull request #24754 from cpuguy83/24749_better_err_not_a_dir
Improve error message for ENOTDIR errors
2016-07-19 00:30:40 +02:00
Arnaud Porterie 6fc46474fb Merge pull request #24701 from dperny/test-leader-proxy
Added test for leader proxying
2016-07-18 22:15:16 +00:00
Sebastiaan van Stijn 4f0b510552
Don't automagically add "[OPTIONS]" to usage
This removes the logic to automatically
add [OPTIONS] to the usage output.

The current logic was broken if a command
only has deprecated or hidden flags, and
in many cases put the [OPTIONS] in the
wrong location.

Requiring the usage string to be set
manually gives more predictable results,
and shouldn't require much to maintain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-19 00:07:19 +02:00
Sebastiaan van Stijn f0988dd395
update "image delete" error to match actual behavior
The error message;

    unable to delete .... (must be forced) - image is referenced in one or more repositories

Looks to be incorrect

Given the following images:

    docker images | grep 2d36b1c0ea40
    registry                           2                                     2d36b1c0ea40        7 weeks ago         171.2 MB
    registry                           2.4.1                                 2d36b1c0ea40        7 weeks ago         171.2 MB

Removing the image by *id* fails:

    docker rmi 2d36b1c0ea40
    Error response from daemon: conflict: unable to delete 2d36b1c0ea40 (must be forced) - image is referenced in one or more repositories

However, after untagging one image:

    docker rmi registry:2
    Untagged: registry:2

Removing the image works:

    docker rmi 2d36b1c0ea40
    Untagged: registry:2.4.1
    Deleted: sha256:2d36b1c0ea40159adc8b36f7563f1d7a6d443384fe2611e8b393c1cb3ae2e6ad
    Deleted: sha256:7abfddbf4e61927307b6646010845eeb7513ecc6541f33ea6103b2493e36aa4e
    Deleted: sha256:f512d7699dbb2994fe15d30ee1d404e57b58c3c310617b4471db649680b4cfa0
    Deleted: sha256:7291e34714908270aeda93f1dc681485f9734d41314e2fdc6c11f32ffa782a21
    Deleted: sha256:548f6562929484f3d78267e4b1e31dcfeb9f303059668888b4423ce5501c7fbc
    Deleted: sha256:afe56b46629e6d8e0bfc36fed13395a7cfa2bd83b58bb489976ef13553eff20b
    Deleted: sha256:cf0c3bd5d6a0a14ebf96cc7d3df79a37774a70f3086273e09da71a86fe74fec2
    Deleted: sha256:c5fdaf8b055f544d0211043e687905315c3a0b71c1c08df07e473dd0a30e43c8

    docker images | grep 2d36b1c0ea40
    <empty>

This changes the error message to reflect that behavior

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-18 23:17:55 +02:00
Sebastiaan van Stijn 589bafddf3
bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-18 23:15:03 +02:00
Drew Erny d305aa48dd Added test for leader proxying
Signed-off-by: Drew Erny <drew.erny@docker.com>
2016-07-18 13:18:02 -07:00
Sebastiaan van Stijn e7b96102ff Merge pull request #24764 from aaronlehmann/vendor-go-events
Update vendored go-events
2016-07-18 22:09:31 +02:00
Sebastiaan van Stijn 8ef820b539 Merge pull request #24659 from justyntemme/master
Fix for issue #23884 (Documentation clarification)
2016-07-18 21:58:55 +02:00
Justyn Temme b74b46b26a suggested improvements for Debian install doc issue #23884
Signed-off-by: Justyn Temme <justyntemme@gmail.com>
2016-07-18 14:38:58 -05:00
Aaron Lehmann db9bc51cbe Update vendored go-events
This is needed to suppress a log message about a harmless condition
which was previously logged at the WARNING log level with potentially
high frequency (https://github.com/docker/go-events/pull/11).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-18 10:38:27 -07:00
Anusha Ragunathan 6dca1e6d3f Print plugin name on successful install, enable and disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-18 09:47:12 -07:00
Arnaud Porterie ba6adc5f46 Merge pull request #24646 from anusha-ragunathan/use-volume-plugins
Remove use of exec-root in plugins due to socket pathname limits.
2016-07-18 16:28:22 +00:00
Vincent Demeester 0ec1adf9d1 Merge pull request #24694 from tonistiigi/increase-timeout
Increase timeout for swarm requests
2016-07-18 18:15:37 +02:00
Arnaud Porterie de64324109 Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
2016-07-18 16:07:23 +00:00
Arnaud Porterie 98a4b3e332 Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
2016-07-18 16:05:46 +00:00
Brian Goff 83ae501f1d Improve error message for ENOTDIR errors
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-18 11:12:33 -04:00
Sebastiaan van Stijn c4d9c828d8 Merge pull request #24727 from miaoyq/fix-link-err-in-docs
Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
2016-07-18 14:34:20 +02:00
Yanqiang Miao f9ef10f853 Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-19 02:53:03 +08:00
Vincent Demeester 4ced001d9a Merge pull request #24729 from yongtang/24058-api-docs-resource-settings
Fix inconsistent fields for resource settings on service for API docs
2016-07-18 10:20:20 +02:00
Yong Tang 0159ee1f5d Fix inconsistent fields for resource settings on service for API docs
In API docs, `CPU` and `Memory` were used for resource settings on
services. The actual settings should be `NanoCPUs` and `MemoryBytes`.

This fix address the inconsistent fields between API docs and actual
settings.

This fix fixes #24058.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-17 16:45:09 -07:00
Sebastiaan van Stijn caf8c75572 Merge pull request #24728 from icaoweiwei/patch_2016-07-17_1
Fix a wrong word in comment.
2016-07-17 13:04:27 +02:00
Cao Weiwei 9be8bf0194 Fix a wrong word in comment.
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
2016-07-17 13:08:07 +08:00
Doug Davis b23fc63f04 Merge pull request #24723 from icaoweiwei/patch_2016-07-16_2
Fix a syntax error in comments
2016-07-16 12:07:54 -04:00
Cao Weiwei 3fc9a9ccb8 Fix a syntax error in comments
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
2016-07-16 22:41:04 +08:00
Sebastiaan van Stijn 41391233e2 Merge pull request #24718 from thaJeztah/fix-oracle-support-link
docs: update Oracle support link
2016-07-16 15:26:04 +02:00
Sebastiaan van Stijn c15144c4ec
docs: update Oracle support link
The none-https url results in a redirect
to https://support.oracle.com/epmos/faces/MosIndex.jspx?......
which our link-checker didn't like.

The https link looks to be a direct link,
and not resulting in a redirect, so updating the URL.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-16 14:34:07 +02:00
Doug Davis 792adb7199 Merge pull request #24715 from allencloud/fix-creats-into-creates-in-comments
fix typo creats into creates in comments
2016-07-16 07:15:37 -04:00
allencloud 0d459f5ed3 fix typo creats into creates in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 17:55:18 +08:00