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

34227 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emil Davtyan
2d6fb87ca4 Wrap response error for container logs method. 
Signed-off-by: Emil Davtyan <emil2k@gmail.com>
 2018-01-12 16:43:51 +01:00
Brian Goff
92309e34e4
Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues 
Fix race with concurrent daemon startup in tests
 2018-01-11 14:26:35 -05:00
Brian Goff
9e3193810d Fix race with concurrent daemon startup in tests 
Using parallel tests is nice, however it can cause an issue with
multiple daemons trying to make changes to iptables at the same time
which causes flakey tests.

This just disables iptables for the set of tests since it is not
required.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-01-11 11:47:21 -05:00
Yong Tang
cc79c6c7da
Merge pull request #35976 from thaJeztah/bump-libnetwork2 
Bump libnetwork to a1dfea384b39779552a3b4837ea9303194950976
 2018-01-10 22:56:00 -08:00
Sebastiaan van Stijn
4c3afb53e6
Bump libnetwork to a1dfea384b39779552a3b4837ea9303194950976 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-10 18:09:05 +01:00
Yong Tang
88b94d7849
Merge pull request #35902 from dnephin/cleanup-graphdriver-quota-tests 
Skip graphdriver/quota TestBlockDev if dependencies are not available
 2018-01-10 05:32:16 -08:00
Yong Tang
484612f388
Merge pull request #30897 from yongtang/30242-network-duplicate-names 
Update `FindNetwork` to address network name duplications
 2018-01-10 05:30:58 -08:00
Yong Tang
062b4c8013
Merge pull request #35968 from Microsoft/jjh/go-winio-0.4.6 
Revendor Microsoft/go-winio @ v0.4.6
 2018-01-10 05:23:50 -08:00
Vincent Demeester
7c7a7c7944
Merge pull request #35940 from yongtang/35920-filter-health-starting 
Fix issue of filter in `docker ps` where `health=starting` returns nothing
 2018-01-10 14:12:47 +01:00
Sebastiaan van Stijn
178d027829
Merge pull request #35970 from RenaudWasTaken/cli-fix 
Fix node-generic-resources CLI typo
 2018-01-10 12:49:00 +01:00
Doug Davis
7f81894df2
Merge pull request #35969 from Microsoft/jjh/typo-would 
Fix typo 'woudld' to 'would'
 2018-01-09 22:40:30 -05:00
Renaud Gaubert
6702ac590e Fix node-generic-resources CLI typo 
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
 2018-01-10 00:51:47 +01:00
John Howard
d92acd5910 Fix typo 'woudld' to 'would' 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-01-09 14:25:33 -08:00
John Howard
2956ef1db2 Revendor Microsoft/go-winio @ v0.4.6 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-01-09 13:41:16 -08:00
Brian Goff
274538c70b
Merge pull request #35748 from dnephin/try-new-containerd-cio 
Update vendor of containerd, use new containerd/cio
 2018-01-09 15:56:05 -05:00
Daniel Nephin
9d20d5eb3f Fix libcontainerd/client.Restore() handling of io cleanup 
Make the behvious of cleaning up DirectIO more obvious

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-09 12:03:02 -05:00
Daniel Nephin
d72dfbfa8d Use cio.FIFOSet.Close() to cleanup fifos 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-09 12:00:28 -05:00
Daniel Nephin
3fec7c0858 Remove libcontainerd.IOPipe 
replaced with cio.DirectIO

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-09 12:00:28 -05:00
Daniel Nephin
4f5c47aae4 Update vendor 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-09 12:00:27 -05:00
Yong Tang
94b8a116fb
Merge pull request #35957 from crosbymichael/ramdisk 
Honor DOCKER_RAMDISK with containerd 1.0
 2018-01-08 17:38:17 -08:00
Brian Goff
7f6fdce901
Merge pull request #35959 from dnephin/remove-str-error-checking 
Use errdefs instead of string contains for checking not found
 2018-01-08 20:33:51 -05:00
Yong Tang
b4c7017f8d
Merge pull request #35958 from yongtang/35956-doc-CopyFromContainer 
Update doc for CopyFromContainer
 2018-01-08 15:22:40 -08:00
Daniel Nephin
9b62d4ffa3 Use errdefs instead of string contains for checking not found 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-08 14:32:39 -05:00
Daniel Nephin
e3a6323419 Cleanup graphdriver/quota test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-08 13:41:45 -05:00
Yong Tang
e330e7a5ce Update doc for CopyFromContainer 
This fix updates doc for CopyFromContainer to explicitly
mention that the content received from the reader is
a TAR archive.

This fix closes 35965.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-08 18:29:59 +00:00
Michael Crosby
54051e9e64 Honor DOCKER_RAMDISK with containerd 1.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-08 12:01:03 -05:00
Sebastiaan van Stijn
16a1736b9b
Merge pull request #35593 from ndeloof/master 
Improve swagger schema for code generation
 2018-01-08 12:17:56 +01:00
Sebastiaan van Stijn
847df43d1d
Merge pull request #35798 from ndeloof/ProgressDetail 
Progress detail
 2018-01-08 11:28:49 +01:00
Yong Tang
f509a54bdd Add test case for docker ps -f health=starting 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-07 05:10:36 +00:00
Yong Tang
b249ccb115 Update and use FindNetwork on Windows. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-07 03:32:37 +00:00
Sebastiaan van Stijn
c6378920e1
Merge pull request #35033 from chchliang/viservice 
Add `namespace method` conver in `TestV1IDService`
 2018-01-06 14:37:48 +01:00
Yong Tang
cafed80cd0 Update FindUniqueNetwork to address network name duplications 
This fix is part of the effort to address 30242 where
issue arise because of the fact that multiple networks
may share the same name (within or across local/swarm scopes).

The focus of this fix is to allow creation of service
when a network in local scope has the same name as the
service network.

An integration test has been added.

This fix fixes 30242.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-06 01:55:28 +00:00
Yong Tang
39faf2a3a8
Merge pull request #35509 from cpuguy83/splunk_dont_readall 
Splunk: limit the reader size on error responses
 2018-01-05 12:34:35 -08:00
Sebastiaan van Stijn
d80c13a541
Merge pull request #35570 from zemanlx/feature/journald-with-SYSLOG_IDENTIFIER 
Add journald tag as SYSLOG_IDENTIFIER
 2018-01-05 20:56:55 +01:00
chchliang
0446b6a04e add namespace method conver 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
 2018-01-05 16:24:18 +08:00
John Stephens
fff4232899
Merge pull request #35925 from Microsoft/jjh/builder-default-rw-size-bump 
Windows: Bump RW layer size
 2018-01-04 22:54:38 -08:00
Yong Tang
97b16aecf9 Fix issue of filter in docker ps where health=starting returns nothing 
This fix tries to address the issue raised in 35920 where the filter
of `docker ps` with  `health=starting` always returns nothing.

The issue was that in container view, the human readable string (`HealthString()` => `Health.String()`)
of health status was used. In case of starting it is `"health: starting"`.
However, the filter still uses `starting` so no match returned.

This fix fixes the issue by using `container.Health.Status()` instead so that it matches
the string (`starting`) passed by filter.

This fix fixes 35920.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2018-01-05 05:16:09 +00:00
Yong Tang
50ce546450
Merge pull request #35737 from tonistiigi/fix-git-submodules 
gitutils: fix checking out submodules
 2018-01-05 10:41:04 +08:00
Lei Jitang
51ccedda52
Merge pull request #35753 from kolyshkin/netgo 
install-containerd-static: use netgo buildtag
 2018-01-05 09:05:46 +08:00
Sebastiaan van Stijn
4459775eea
Merge pull request #35924 from Microsoft/32838-partial-fix 
Vendor Microsoft/hcsshim @ v0.6.8
 2018-01-04 17:49:17 +01:00
John Howard
deb335d04f Windows: Bump RW layer size 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-01-03 15:59:06 -08:00
John Howard
172a442c27 Vendor Microsoft/hcsshim @ v0.6.8 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-01-03 10:19:05 -08:00
Sebastiaan van Stijn
fda904911d
Merge pull request #35772 from arm64b/multi-arch-manifest-support 
Download support of images with multi-arch manifest
 2018-01-03 19:03:33 +01:00
Brian Goff
f72b180ae1
Merge pull request #35694 from boucher/checkpoint-dir-fix 
Don't append the container id to custom directory checkpoints.
 2018-01-03 11:22:21 -05:00
Yong Tang
99c22b0034
Merge pull request #35822 from keyolk/35709-fix-docker-build-overlayfs-whiteout 
skip container ID remapping, if the file is overlayfs whiteout.
 2018-01-03 22:21:00 +08:00
Chanhun Jeong
b013c1541d skip container ID remapping, if the file is overlayfs whiteout. 
Signed-off-by: Chanhun Jeong <chanhun.jeong@navercorp.com>
 2018-01-03 17:06:59 +09:00
Brian Goff
c345c53859
Merge pull request #35840 from kolyshkin/misc-test 
Misc test improvements
 2018-01-02 09:14:20 -05:00
Sebastiaan van Stijn
30c9cb1ead
Merge pull request #35895 from javabrett/docs-contributing-moby-docker-paths 
Fixed in-container paths in dev doc: moby/moby -> docker/docker.
 2018-01-02 13:30:19 +01:00
Sebastiaan van Stijn
ff61d127fe
Merge pull request #35893 from thaJeztah/cleanup-mailmap 
Cleanup mailmap, and update authors
 2018-01-02 12:50:43 +01:00
Sebastiaan van Stijn
63c86ad2ea
Cleanup and sort .mailmap 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-02 12:48:14 +01:00