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

29797 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arnaud Porterie
39473dad54 Merge pull request #29349 from vdemeester/try-to-fix-win2lin 
Fix failures on Win2lin
 2016-12-13 08:35:25 -08:00
Sebastiaan van Stijn
59a496e664 Merge pull request #29361 from thaJeztah/update-service-ps-reference 
Update reference docs for service ps
 2016-12-13 16:59:37 +01:00
Vincent Demeester
cda04547c0 Merge pull request #29000 from yongtang/24352-swarm-update-no-flags 
Show usage when `docker swarm update` has no flags
 2016-12-13 16:07:02 +01:00
Vincent Demeester
525c7bb930 Merge pull request #29359 from yuexiao-wang/fix-network-option 
Fix the option name for network
 2016-12-13 15:20:25 +01:00
yuexiao-wang
b101e451f1 Fix the incorrect option name 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-14 04:10:09 +08:00
Vincent Demeester
96ac223a13 Merge pull request #29346 from xlgao-zju/just-return-assignment 
Get rid of err altogether by just returning the assignment
 2016-12-13 15:19:45 +01:00
Vincent Demeester
c2b7480604 Merge pull request #29335 from tophj-ibm/skip-plugin-test 
[integration-cli] skip plugin tests on non-x86
 2016-12-13 14:54:41 +01:00
Yong Tang
5aa5a1cb00 Show usage when docker swarm update has no flags 
This fix tries to address the issue raised in 24352. Previously,
when `docker swarm update` has no flags, the output is
```
Swarm updated.
```
even though nothing was updated. This could be misleading for
users.

This fix tries to address the issue by adding a `PreRunE` function
in the command so that in case no flag is provided (`cmd.Flags().NFlag() == 0`),
the usage will be outputed instead.

An integration has been added to cover the changes.

This fix fixes 24352.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-13 05:05:04 -08:00
Sebastiaan van Stijn
5902fa3384
Update reference docs for service ps 
commit bbd2018ee1
changed the output format of `docker service ps`.

this patch updates the reference docs
to match the updated output format.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-13 13:30:58 +01:00
Vincent Demeester
1bc942597d Merge pull request #29216 from allencloud/add-status-code-403-for-services-create 
add missing status code 403 for services/create in docs
 2016-12-13 12:27:56 +01:00
Vincent Demeester
ce9960a9b2 Merge pull request #29348 from lixiaobing10051267/masterMount 
modify some wrong func information in device_tool.go
 2016-12-13 12:23:43 +01:00
Vincent Demeester
3b9646b4a4 Merge pull request #29352 from lixiaobing10051267/masterStack 
stack_config.md not exist and delete it in other files
 2016-12-13 12:18:13 +01:00
Vincent Demeester
e857785df4
Fixing win2lin builds by adding a testRequires to DockerDaemonSuite 
The success of the win2lin CI before was really "by chance" on the
DockerDaemonSuite : the DockerDaemonSuite was panicking when starting
the daemon on the first non-skipped test.The suite panicked but as
the error returned from `StartWithBusybox` was nil, the test kept
going and was OK because the client had all the correct environment
variables set up to discuss with the remote daemon.

Then, as the suite panicked, no more test attached on the
DockerDaemonSuite ran (that's why on win2lin, `DockerDaemonSuite` was
only composed by 5 tests !). The really bad thing is, we didn't get
any report of the panic on the suite (go-check hiding something
somewhere).

As DockerDaemonSuite needs to run test on the same host as it's
running, this adds a `SameHostDaemon` requirement to the Suite.

This changes also make sure `TestRestartContainerWithRestartPolicy`
does left weirdies behind it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-13 12:04:53 +01:00
lixiaobing10051267
afaff51a8b stack_config.md not exist and delete it 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-13 18:06:18 +08:00
lixiaobing10051267
cde57a0d56 modify some wrong func information in device_tool.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-13 17:49:03 +08:00
Vincent Demeester
7f44e09797 Merge pull request #28437 from thaJeztah/deprecate-default-network-inspect 
deprecate "top-level" network information in NetworkSettings
 2016-12-13 08:58:57 +01:00
Vincent Demeester
3d52c86d4c Merge pull request #29267 from yuexiao-wang/fix-bulid-para 
Update the option for docker build
 2016-12-13 08:55:20 +01:00
yuexiao-wang
cd317282c9 Update the option 'network' for docker build 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-13 18:18:53 +08:00
Xianglin Gao
da5d3cccc4 Get rid of err altogether by just returning the assignment 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
 2016-12-13 14:25:57 +08:00
allencloud
0270645c13 return not a swarm when unlock 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-13 10:38:45 +08:00
Victor Vieux
e9076c0f00 Merge pull request #29337 from anusha-ragunathan/unmount_enable_err 
When plugin enable fails, unmount PropagatedMount.
 2016-12-12 16:02:16 -08:00
Christopher Jones
ebff8c79a3
[integration-cli] skip plugin tests on non-x86 
Due to the test plugins being architecture specific, these
tests fail to start the plugin (even though they don't fail yet)

Temporary fix until we can build architecture specific test
plugins.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-12-12 17:17:45 -05:00
Victor Vieux
96a84ed85a Merge pull request #29130 from cyphar/29097-dynamically-reload-apparmor 
daemon: switch to 'ensure' workflow for AppArmor profiles
 2016-12-12 13:32:36 -08:00
Anusha Ragunathan
cef443bddf When plugin enable fails, unmount PropagatedMount. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-12-12 13:25:06 -08:00
Anusha Ragunathan
8de2336f07 Merge pull request #29230 from vieux/remove_old_media_type_plugin 
remove old media type compat for plugins
 2016-12-12 12:43:32 -08:00
Vincent Demeester
59ba895a0f Merge pull request #29208 from andrewhsu/validate-changelog 
validate CHANGELOG.md is well-formed
 2016-12-12 17:59:41 +01:00
Brian Goff
4530097582 Merge pull request #29319 from sanimej/libn-bump 
Vendor libnetwork @4df06c4
 2016-12-12 11:41:57 -05:00
Vincent Demeester
3356442d00 Merge pull request #29074 from yongtang/29044-swarm-ipam-options 
Fix missing IPAM options in swarm network mode
 2016-12-12 17:27:01 +01:00
Sebastiaan van Stijn
91dd29acdc Merge pull request #29196 from aluzzardi/service-ps-output 
service ps: Revert output to 1.12 behavior.
 2016-12-12 17:20:45 +01:00
Sebastiaan van Stijn
f1736dfa33 Merge pull request #29308 from pengqinglan/fix-contents-links 
fix some broken contents links
 2016-12-12 15:02:32 +01:00
Qinglan Peng
bac792c163 fix some broken contents links 
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>

fix-contents-links

Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
 2016-12-12 21:34:37 +08:00
Sebastiaan van Stijn
8f57ac390f Merge pull request #29289 from vdemeester/integration-cli-startwithbusybox 
[integration-cli] Use *check.C in Start/Stop on Daemon struct
 2016-12-12 11:39:26 +01:00
Vincent Demeester
1a7c906757 Merge pull request #29318 from lixiaobing10051267/masterBuilder 
fix some wrong vars or funcs in builder.go
 2016-12-12 11:22:29 +01:00
Sebastiaan van Stijn
94a2996bde Merge pull request #29311 from djmaze/patch-1 
Fix link to volume label support issue in changelog
 2016-12-12 10:58:58 +01:00
Vincent Demeester
cc85b14d9c Merge pull request #29309 from ohmk/fix-description-of-docker-swarm-command 
Fix description of docker swarm command
 2016-12-12 10:34:35 +01:00
Vincent Demeester
a1307aab28 Merge pull request #29287 from Microsoft/jjh/fixd4w301 
Windows: Fix crash in docker system prune
 2016-12-12 10:30:13 +01:00
Sebastiaan van Stijn
9f92818afe Merge pull request #29320 from lixiaobing10051267/masterExtendConfig 
replace env description with args in extend config
 2016-12-12 10:23:40 +01:00
lixiaobing10051267
abdc031aea replace env description with args in extend config 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-12 17:24:12 +08:00
Sebastiaan van Stijn
9863470c96 Merge pull request #29305 from albers/completion-inspect-plugins 
Add bash completion for `docker inspect --type plugin`
 2016-12-12 10:13:30 +01:00
Vincent Demeester
4d78a8fd0f Merge pull request #29317 from sdurrheimer/zsh-completion-inspect-types 
Add zsh completion for 'docker inspect --type=plugin' and other missing ones
 2016-12-12 10:11:59 +01:00
lixiaobing10051267
ee8a3eee4f fix some wrong vars or funcs in builder.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-12 17:11:41 +08:00
Steve Durrheimer
2bdffc1fb5
Add zsh completion for 'docker inspect --type=plugin' and other missing ones 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-12-12 10:09:05 +01:00
Vincent Demeester
c502fb49dc Use *check.C in StartWithBusybox, Start, Stop and Restart… 
… to make sure it doesn't fail. It also introduce StartWithError,
StopWithError and RestartWithError in case we care about the
error (and want the error to happen).

This removes the need to check for error and make the intent more
clear : I want a deamon with busybox loaded on it — if an error occur
it should fail the test, but it's not the test code that has the
responsability to check that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-12 09:46:47 +01:00
Santhosh Manohar
b6b6d3ade4 Vendor libnetwork @4df06c4 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-12-12 00:29:54 -08:00
Vincent Demeester
9d4aa3621f Make --publish-rm precedes --publish-add, so that add wins 
`--publish-add 8081:81 --publish-add 8082:82 --publish-rm 80
--publish-rm 81/tcp --publish-rm 82/tcp` would thus result in 81 and
82 to be published.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-11 23:14:54 +01:00
Vincent Demeester
75bf18c9f0 Remove --port and update --publish for services to support syntaxes 
Add support for simple and complex syntax to `--publish` through the
use of `PortOpt`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-11 23:14:54 +01:00
Martin Honermeyer
bb06e138e4 Fix link to volume label support in changelog 
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
 2016-12-11 17:43:29 +01:00
Kei Ohmura
2f0e00f587 docs: fix description of docker swarm update --help 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
 2016-12-11 21:25:40 +09:00
Kei Ohmura
77dd8474a7 docs: fix description of docker swarm join --help 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
 2016-12-11 21:21:48 +09:00
Harald Albers
81b4b2b5fa Add bash completion for docker inspect --type plugin 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-12-10 13:31:42 -08:00