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

30059 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tõnis Tiigi
edaa3c6f07 Merge pull request #29609 from dnephin/add-compose-file-package 
Replace the vendored aanand/compose-file with a local copy
 2016-12-29 15:12:59 -08:00
Tõnis Tiigi
aacc2c8880 Merge pull request #29624 from yongtang/29619-build-label-order 
Sort the labels passed from `build --labels`
 2016-12-29 15:09:53 -08:00
Sebastiaan van Stijn
a247bf0e99 Merge pull request #29661 from vdemeester/integration-cli-test-environment 
[integration-test] Introduce an environment package
 2016-12-29 22:12:42 +01:00
Brian Goff
11b11e1559 Merge pull request #29769 from duglin/FixWinTest 
Fix flaky windows TestRestartRunningContainer test
 2016-12-29 15:48:43 -05:00
Sebastiaan van Stijn
1dd9410776 Merge pull request #29683 from vdemeester/runconfig-clean 
Clean some stuff from runconfig that are cli only…
 2016-12-29 17:42:08 +01:00
Sebastiaan van Stijn
156ee50834 Merge pull request #29770 from allencloud/fail-fast-when-filter-invlaid 
fail fast when network filter invalid
 2016-12-29 17:38:08 +01:00
Doug Davis
bae22d167c Fix flaky windows TestRestartRunningContainer test 
I was seeing this for windowsRS1 testing:
17:20:36 ----------------------------------------------------------------------
17:20:36 FAIL: docker_cli_restart_test.go:31: DockerSuite.TestRestartRunningContainer
17:20:36
17:20:36 docker_cli_restart_test.go:39:
17:20:36     c.Assert(out, checker.Equals, "foobar\n")
17:20:36 ... obtained string = ""
17:20:36 ... expected string = "foobar\n"
17:20:36
17:20:59
17:20:59 ----------------------------------------------------------------------

and I think its because there's a delay between the time the container is
started and the 'echo' is actually run. This gives it up to 10 seconds
to do the 'echo' before giving up.

/cc @jhowardmsft

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-12-29 08:13:43 -08:00
Vincent Demeester
83cecf820a Merge pull request #29517 from thaJeztah/update-criu 
Update criu to 2.9
 2016-12-29 16:20:59 +01:00
Sebastiaan van Stijn
00cdb97f0d Merge pull request #29222 from yongtang/28789-plugin-inspect-follow-up 
Allow ID-based `docker plugin enable/disable/rm/set`
 2016-12-29 13:40:40 +01:00
Sebastiaan van Stijn
d2b27c10a1 Merge pull request #29740 from lixiaobing10051267/masterGraph2 
update URL of plugins_graphdriver.md in experimental/README.md
 2016-12-29 11:34:19 +01:00
Sebastiaan van Stijn
f635cf05ab Merge pull request #29478 from AkihiroSuda/fix-gcplogs-29344 
gcplogs: forcibly set HOME on static UNIX binary
 2016-12-29 11:27:23 +01:00
Vincent Demeester
433e2e8a1e
Introduce a environment package in integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-29 11:00:50 +01:00
allencloud
ee2925e2f9 fail fast when network filter invalid 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-29 17:34:53 +08:00
Vincent Demeester
4d5cba127b Merge pull request #29687 from thaJeztah/cleanup-cli-command-container 
Minor cleanups in cli/command/container
 2016-12-29 09:31:46 +01:00
Sebastiaan van Stijn
79f1c9c81d Merge pull request #29762 from vdemeester/integration-mini-clean 
Small cleanup in `integration-cli/docker_utils.go` 👼
 2016-12-29 09:29:53 +01:00
Sebastiaan van Stijn
021710fcdf Merge pull request #29371 from vdemeester/clean-integration-utils 
[test-integration] Clean utils.go from most of its content
 2016-12-29 09:28:46 +01:00
Akihiro Suda
b86e3bee5a gcplogs: forcibly set HOME on static UNIX binary 
Fix #29344

If HOME is not set, the gcplogs logging driver will call os/user.Current() via oauth2/google.
However, in static binary, os/user.Current() leads to segfault due to a glibc issue that won't be fixed
in a short term. (golang/go#13470, https://sourceware.org/bugzilla/show_bug.cgi?id=19341)
So we forcibly set HOME so as to avoid call to os/user/Current().

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-12-29 03:17:26 +00:00
lixiaobing10051267
82eeab62df update URL of plugins_graphdriver.md in experimental/README.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-29 10:24:06 +08:00
Brian Goff
a2b12b5e82 Merge pull request #29679 from yongtang/29667-docker-build-workdir-cmd 
Fix image's `CMD` after `WORKDIR` in Dockerfile
 2016-12-28 20:26:59 -05:00
Sebastiaan van Stijn
841968d55c Merge pull request #29763 from omallo/29729-dostorage-plugin-docs 
Reference new DigitalOcean plugin (Closes #29729)
 2016-12-28 23:34:17 +01:00
Ovidio Mallo
ed55d71ead Reference new DigitalOcean plugin (Closes #29729) 
Signed-off-by: Ovidio Mallo <ovidio.mallo@gmail.com>
 2016-12-28 23:13:17 +01:00
Yong Tang
c80e74e8cc Tests to allow ID-based docker plugin enable/disable/rm/set 
This fix is a follow up based on comment:

and a follow up to:
https://github.com/docker/docker/pull/29222#issuecomment-268908937

As #28789 has been merged in, it is possible for `docker plugin inspect`
to search based on Name or ID Prefix. However, ID-based
`docker plugin enable/disable/rm/set` are still not possible.

This fix addes test for  `docker plugin enable/disable/rm/set` to search based on:
- Full ID
- Full Name
- Partial ID (prefix)

The actual fix is done in  #29487.

This fix is a follow up of #28789 and  #29487.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-28 14:10:43 -08:00
Vincent Demeester
b2320d121c
Small cleanup in integration-cli/docker_utils.go 👼 
- Move *one-shot* (one use) function where it is actually used (easier
  to know what's going on).
- Remove `pullImageIfNotExist` function as it might be an artifact
  from way back. We don't need it as we already have frozen/loaded
  image of busybox.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-28 23:00:32 +01:00
Daniel Nephin
38d08b0bd1 Add validation for compose schema bindata. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-28 14:45:44 -05:00
Vincent Demeester
def13fa23c
Clean integration-cli/utils.go from most of its content 
Most of the code is now on pkg/integration.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-28 19:05:48 +01:00
Brian Goff
1dece339c3 Merge pull request #29476 from vdemeester/make-set-container-name 
Add the possibility to set the dev container name
 2016-12-28 12:22:32 -05:00
Alexander Morozov
4f657ff55c Merge pull request #29313 from vdemeester/move-cli-config 
Move package cliconfig to cli/config
 2016-12-28 09:05:51 -08:00
Brian Goff
b0aab6e83e Merge pull request #29475 from AkihiroSuda/vendor-oauth2-3 
Vendor gcplogs deps
 2016-12-28 11:55:03 -05:00
Brian Goff
631f51015e Merge pull request #29684 from vdemeester/quick-unit 
Enhance pkg/{httputils,integration}, distribution/xfer unit tests
 2016-12-28 10:57:56 -05:00
Brian Goff
c246b02fca Merge pull request #29737 from tonistiigi/fix-rootfs-check 
Fix validation of plugins without rootfs in config
 2016-12-28 10:49:58 -05:00
Brian Goff
a412c1b7a0 Merge pull request #29668 from dmcgowan/plugins-dct 
Support Docker Content Trust for plugins
 2016-12-28 10:43:32 -05:00
Doug Davis
9fab262690 Merge pull request #29752 from allencloud/fix-nits-in-comments 
fix nits in comments
 2016-12-28 08:33:48 -05:00
Vincent Demeester
522bfd926b
Enhance pkg/{httputils,integration}, distribution/xfer unit tests 
- Make it possible to define a shorter waiting time of httputils
- Make a small hack to reduce the waiting time on distribution/xfer

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-28 11:54:05 +01:00
Sebastiaan van Stijn
01c62d6e54 Merge pull request #29744 from yuexiao-wang/update-docker-ps 
Update the field 'CONTAINER ID' for docker ps
 2016-12-28 11:46:06 +01:00
yuexiao-wang
b3faa7755a Update the field 'CONTAINER ID' for docker ps 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-29 02:00:31 +08:00
Sebastiaan van Stijn
38178cda41 Merge pull request #29696 from zhenghenghuo/branch-two 
fix some typos
 2016-12-28 08:05:43 +01:00
zhenghenghuo
f1a19fa8c0 fix some typos 
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass the test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>
 2016-12-28 09:43:27 +08:00
Tonis Tiigi
6c7cb52009 Fix validation of plugins without rootfs in config 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-12-27 15:36:12 -08:00
Daniel Nephin
f5af9b9738 Replace vendor of aanand/compose-file with a local copy. 
Add go-bindata for including the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-27 16:17:24 -05:00
Daniel Nephin
32425d3add Add deps to test compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-27 16:17:24 -05:00
Derek McGowan
14e8bba4f5
Support for docker content trust for plugins 
Add integration test for docker content trust

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-12-27 12:51:00 -08:00
Brian Goff
bf6eb85539 Merge pull request #29666 from tonistiigi/client-deps 
Clean up client binary dependencies
 2016-12-27 15:01:24 -05:00
Sebastiaan van Stijn
823718c3b4 Merge pull request #29701 from yuexiao-wang/add-field 
Update 'ID' field for 'docker plugin ls'
 2016-12-27 20:04:28 +01:00
Brian Goff
efbb23f3e6 Merge pull request #29716 from yongtang/28885-docker-stack-ps-all 
Remove `docker stack ps -a` to match removal of `docker service/node ps -a`
 2016-12-27 13:56:01 -05:00
Alexander Morozov
e3f61bd254 Merge pull request #29694 from lixiaobing10051267/masterFileNodify2 
It is errNoSuchWatch not errNoSuchPoller in filenotify/poller.go
 2016-12-27 09:04:34 -08:00
allencloud
6fb05778ba fix nits in comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-27 23:30:50 +08:00
Vincent Demeester
592f9891d4 Merge pull request #29725 from yuexiao-wang/remove-redundant-var 
Remove unused variable
 2016-12-27 16:05:43 +01:00
yuexiao-wang
08c6575caf Remove unused variable 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-28 03:20:41 +08:00
Justin Cormack
9f60ae538b Merge pull request #29720 from lixiaobing10051267/masterArmClone 
use https clone url for docker/docker in ARM.md
 2016-12-27 14:05:15 +00:00
Sebastiaan van Stijn
7a339eb4e9 Merge pull request #28692 from allencloud/splict-function-out-of-command-denifition-scope 
refactor code to split function out of command definition scope
 2016-12-27 13:48:12 +01:00