0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25812 commits 14 branches 412 tags 338 MiB
Commit graph

25812 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
allencloud
d0081a0f47 better command docker network create -h output 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-16 15:32:17 +08:00
Sebastiaan van Stijn
9ad857a788 Merge pull request #24682 from justincormack/oom-score-adj-doc 
Document --oom-score-adj flag in docker run
 2016-07-16 03:00:51 +02:00
Sebastiaan van Stijn
ff1040bafc Merge pull request #24599 from vdemeester/small-zsh-completion-fix 
Small zsh completion fix on --pretty & --no-resolve
 2016-07-16 02:55:32 +02:00
Sebastiaan van Stijn
13fcbe3d53 Merge pull request #24280 from miaoyq/24261-fix-make-docker-py-err 
Fix 'make test-docker-py' error
 2016-07-16 02:07:23 +02:00
Sebastiaan van Stijn
64a8317a5a Improve flag help consistency, and update docs 
This adds the `--live-restore` option to the documentation.

Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-16 01:58:01 +02:00
Tibor Vass
8a0acaa512 Merge pull request #24699 from dnephin/fixes_to_service_inspect 
Only show port name if set
 2016-07-15 16:02:02 -07:00
Sebastiaan van Stijn
80965a35c1 Merge pull request #24702 from londoncalling/fix-toolbox-description-docs 
fixed cut-and-paste error on description of Docker Toolbox
 2016-07-15 23:09:06 +02:00
Victoria Bialas
6f9e310831 fixed cut-and-paste error on description of Docker Toolbox 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-07-15 13:54:34 -07:00
Daniel Nephin
909c596fa5 Only show port name if set. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-15 16:02:04 -04:00
Tonis Tiigi
85b1fdf15c Increase timeout for swarm requests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-07-15 11:03:08 -07:00
Sebastiaan van Stijn
9a9fc01af8 Merge pull request #24610 from sfsmithcha/rc4_tutorial_check 
update create swarm and add nodes to use the auto-generated join command
 2016-07-15 19:09:36 +02:00
Michael Crosby
50b3595697 Merge pull request #24690 from thaJeztah/add-new-maintainers 
Add new maintainers
 2016-07-15 09:49:30 -07:00
Anusha Ragunathan
21ecd5a93d Remove use of exec-root in plugins due to socket pathname limits. 
Unix sockets are limited to 108 bytes. As a result, we need to be
careful in not using exec-root as the parent directory for pluginID
(which is already 64 bytes), since it can result in socket path names
longer than 108 bytes. Use /tmp instead. Before this change, setting:
- dockerd --exec-root=/go/src/github.com/do passes
- dockerd --exec-root=/go/src/github.com/doc fails
After this change, there's no failure.

Also, write a volume plugins test to verify that the plugins socket
responds.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-07-15 09:17:29 -07:00
Alexander Morozov
f553362ae5 Merge pull request #24676 from coolljt0725/fix_24674 
Fix daemon panic use wrong graphdriver with --live-restore flag
 2016-07-15 08:44:01 -07:00
Alexander Morozov
c562e3d768 Merge pull request #24642 from tonistiigi/wait-open 
Wait for the reader fifo opening to block
 2016-07-15 08:42:18 -07:00
Sebastiaan van Stijn
d4b932131a
Add new maintainers 
As voted on per e-mail, adding
new maintainers to the list

Welcome!

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-15 17:34:26 +02:00
Vincent Demeester
80ec9fa284 Merge pull request #24638 from miaoyq/fix-docs-err 
Delete  redundant content of 'docs/extend/plugins.md'
 2016-07-15 17:04:11 +02:00
Justin Cormack
6ba6265d1a Document --oom-score-adj flag in docker run 
This was only mentioned in docker create documentation.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 14:11:54 +01:00
Sebastiaan van Stijn
983fc99509 Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode 
Update zsh completion for 'docker service {create,update} {--endpoint…
 2016-07-15 14:40:45 +02:00
Steve Durrheimer
2e6922a6d3
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-07-15 14:36:18 +02:00
Sebastiaan van Stijn
a968f83c55 Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust 
Add zsh completion for 'dockerd --oom-score-adjust'
 2016-07-15 13:47:39 +02:00
Sebastiaan van Stijn
533853dc57 Merge pull request #24669 from hqhq/fix_aufs_docs 
Fix aufs docs
 2016-07-15 13:41:40 +02:00