p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,226 Commits 2 Branches 295 Tags
4bf05acc16b916118bbd0d3fc00a9b988784ffd3
Commit Graph

34226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff
4bf05acc16 Merge pull request #35982 from cpuguy83/fix_concurrent_daemon_test_issues 
Fix race with concurrent daemon startup in tests
Upstream-commit: 92309e34e42aec3a0e041403bdd3c4fc0dc20269
Component: engine
 2018-01-11 14:26:35 -05:00
Brian Goff
8bf6743e94 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>
Upstream-commit: 9e3193810da91d81f6b2dba3171443557f756794
Component: engine
 2018-01-11 11:47:21 -05:00
Yong Tang
a64e387daf Merge pull request #35976 from thaJeztah/bump-libnetwork2 
Bump libnetwork to a1dfea384b39779552a3b4837ea9303194950976
Upstream-commit: cc79c6c7dab994c72133c782a24c69b5ad0f8993
Component: engine
 2018-01-10 22:56:00 -08:00
Sebastiaan van Stijn
f408947b41 Bump libnetwork to a1dfea384b39779552a3b4837ea9303194950976 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4c3afb53e633a832871cada30890e3497fceff02
Component: engine
 2018-01-10 18:09:05 +01:00
Yong Tang
1682b7c735 Merge pull request #35902 from dnephin/cleanup-graphdriver-quota-tests 
Skip graphdriver/quota TestBlockDev if dependencies are not available
Upstream-commit: 88b94d7849c2ec3ab61b179c8bfdeb28507cf451
Component: engine
 2018-01-10 05:32:16 -08:00
Yong Tang
dc5184e050 Merge pull request #30897 from yongtang/30242-network-duplicate-names 
Update `FindNetwork` to address network name duplications
Upstream-commit: 484612f388cabf4b6f4df915f2bf268a8ffdd9fc
Component: engine
 2018-01-10 05:30:58 -08:00
Yong Tang
b1b02a3b31 Merge pull request #35968 from Microsoft/jjh/go-winio-0.4.6 
Revendor Microsoft/go-winio @ v0.4.6
Upstream-commit: 062b4c8013a50afd4c96f4964f0d759c00f000ea
Component: engine
 2018-01-10 05:23:50 -08:00
Vincent Demeester
bf3f938c50 Merge pull request #35940 from yongtang/35920-filter-health-starting 
Fix issue of filter in `docker ps` where `health=starting` returns nothing
Upstream-commit: 7c7a7c7944a28e16aed4d2a0f2d590541f1c5687
Component: engine
 2018-01-10 14:12:47 +01:00
Sebastiaan van Stijn
77c9b11634 Merge pull request #35970 from RenaudWasTaken/cli-fix 
Fix node-generic-resources CLI typo
Upstream-commit: 178d0278296c9a0778755f0804ced34756ee4fc7
Component: engine
 2018-01-10 12:49:00 +01:00
Doug Davis
6252dbd48d Merge pull request #35969 from Microsoft/jjh/typo-would 
Fix typo 'woudld' to 'would'
Upstream-commit: 7f81894df299fbedee2fe891276ba60ccca897a4
Component: engine
 2018-01-09 22:40:30 -05:00
Renaud Gaubert
c31e485134 Fix node-generic-resources CLI typo 
Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
Upstream-commit: 6702ac590e6148cb3f606388dde93a011cb14931
Component: engine
 2018-01-10 00:51:47 +01:00
John Howard
6b1b00bfce Fix typo 'woudld' to 'would' 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d92acd59108565ac2e552e9f04e873decd192e6d
Component: engine
 2018-01-09 14:25:33 -08:00
John Howard
6611bbb002 Revendor Microsoft/go-winio @ v0.4.6 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2956ef1db218f228e6bba5ca8c875aa692092b3d
Component: engine
 2018-01-09 13:41:16 -08:00
Brian Goff
2f79038e74 Merge pull request #35748 from dnephin/try-new-containerd-cio 
Update vendor of containerd, use new containerd/cio
Upstream-commit: 274538c70bfb537430b8543646bc9de36c4d879c
Component: engine
 2018-01-09 15:56:05 -05:00
Daniel Nephin
6f88b66c36 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>
Upstream-commit: 9d20d5eb3fd744088e700292b15d56de29a3361d
Component: engine
 2018-01-09 12:03:02 -05:00
Daniel Nephin
cf94b87820 Use cio.FIFOSet.Close() to cleanup fifos 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d72dfbfa8db9a99be34c2d7963717a08ab7358c5
Component: engine
 2018-01-09 12:00:28 -05:00
Daniel Nephin
097704d16a Remove libcontainerd.IOPipe 
replaced with cio.DirectIO

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3fec7c0858a0a3dee5423e6bffc3a3a1b238c30f
Component: engine
 2018-01-09 12:00:28 -05:00
Daniel Nephin
9cffb84b7c Update vendor 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4f5c47aae4105840a16047b7bca424319a7db709
Component: engine
 2018-01-09 12:00:27 -05:00
Yong Tang
bcd054dac5 Merge pull request #35957 from crosbymichael/ramdisk 
Honor DOCKER_RAMDISK with containerd 1.0
Upstream-commit: 94b8a116fbf1cd90e68d8f5361b520d326a66f9b
Component: engine
 2018-01-08 17:38:17 -08:00
Brian Goff
207f11f4b6 Merge pull request #35959 from dnephin/remove-str-error-checking 
Use errdefs instead of string contains for checking not found
Upstream-commit: 7f6fdce901d51e2692f7d5229d7ba8b4bad6c6a9
Component: engine
 2018-01-08 20:33:51 -05:00
Yong Tang
ec52ac3e88 Merge pull request #35958 from yongtang/35956-doc-CopyFromContainer 
Update doc for CopyFromContainer
Upstream-commit: b4c7017f8d95ab42b1f9aa40260966df2c121cd5
Component: engine
 2018-01-08 15:22:40 -08:00
Daniel Nephin
88fc146546 Use errdefs instead of string contains for checking not found 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9b62d4ffa39f7c042f94f9a3670cae2a816535da
Component: engine
 2018-01-08 14:32:39 -05:00
Daniel Nephin
58f87a5e9a Cleanup graphdriver/quota test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e3a6323419c8b2a81a21134ed49a1624eb483c81
Component: engine
 2018-01-08 13:41:45 -05:00
Yong Tang
844b65b181 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>
Upstream-commit: e330e7a5ce77736c76c36ba77983accfae01c405
Component: engine
 2018-01-08 18:29:59 +00:00
Michael Crosby
1f027b4d1b Honor DOCKER_RAMDISK with containerd 1.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 54051e9e64185e442e034c7e49a5707459a9eed2
Component: engine
 2018-01-08 12:01:03 -05:00
Sebastiaan van Stijn
5017f2840c Merge pull request #35593 from ndeloof/master 
Improve swagger schema for code generation
Upstream-commit: 16a1736b9b93e44c898f95d670bbaf20a558103d
Component: engine
 2018-01-08 12:17:56 +01:00
Sebastiaan van Stijn
5857ab9402 Merge pull request #35798 from ndeloof/ProgressDetail 
Progress detail
Upstream-commit: 847df43d1df0ef7343d4f623138dcbb4307d6083
Component: engine
 2018-01-08 11:28:49 +01:00
Yong Tang
f75b092795 Add test case for docker ps -f health=starting 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f509a54bdd29b8f65c17097fde3664c6fad36c21
Component: engine
 2018-01-07 05:10:36 +00:00
Yong Tang
7ee813acf5 Update and use FindNetwork on Windows. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b249ccb1151a3c2c7e442b6c1a769821afb28fe4
Component: engine
 2018-01-07 03:32:37 +00:00
Sebastiaan van Stijn
5fe06b3e89 Merge pull request #35033 from chchliang/viservice 
Add `namespace method` conver in `TestV1IDService` 
Upstream-commit: c6378920e14638cc281c5513a989fdff82562426
Component: engine
 2018-01-06 14:37:48 +01:00
Yong Tang
df9a679f90 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>
Upstream-commit: cafed80cd019a8b40025eaa5e5b37459362607fb
Component: engine
 2018-01-06 01:55:28 +00:00
Yong Tang
9c4ef1072a Merge pull request #35509 from cpuguy83/splunk_dont_readall 
Splunk: limit the reader size on error responses
Upstream-commit: 39faf2a3a83c4abad8ed8030a9b942bbb2978359
Component: engine
 2018-01-05 12:34:35 -08:00
Sebastiaan van Stijn
233f49e086 Merge pull request #35570 from zemanlx/feature/journald-with-SYSLOG_IDENTIFIER 
Add journald tag as SYSLOG_IDENTIFIER
Upstream-commit: d80c13a54114de602c8b75030e3ec9c2cde9575b
Component: engine
 2018-01-05 20:56:55 +01:00
chchliang
656c1163c8 add namespace method conver 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
Upstream-commit: 0446b6a04edaae1bddeb1dfdb82fd0d931fe1198
Component: engine
 2018-01-05 16:24:18 +08:00
John Stephens
3887b15050 Merge pull request #35925 from Microsoft/jjh/builder-default-rw-size-bump 
Windows: Bump RW layer size
Upstream-commit: fff423289965260c0ca83024059aa30999792c4a
Component: engine
 2018-01-04 22:54:38 -08:00
Yong Tang
62d7ad0948 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>
Upstream-commit: 97b16aecf9275f4103c2737b79d0c5e81583aa58
Component: engine
 2018-01-05 05:16:09 +00:00
Yong Tang
e76ddf0d7b Merge pull request #35737 from tonistiigi/fix-git-submodules 
gitutils: fix checking out submodules
Upstream-commit: 50ce54645094a5d337e5d841c037663e9f4e3170
Component: engine
 2018-01-05 10:41:04 +08:00
Lei Jitang
ad4db68af2 Merge pull request #35753 from kolyshkin/netgo 
install-containerd-static: use netgo buildtag
Upstream-commit: 51ccedda52413eef2cd4ba8e3948c84501210f3d
Component: engine
 2018-01-05 09:05:46 +08:00
Sebastiaan van Stijn
1fbbb4c59b Merge pull request #35924 from Microsoft/32838-partial-fix 
Vendor Microsoft/hcsshim @ v0.6.8
Upstream-commit: 4459775eeaa0a3239866fe091014eb1e707bdc2c
Component: engine
 2018-01-04 17:49:17 +01:00
John Howard
fb52c2003b Windows: Bump RW layer size 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: deb335d04fd47e96fdb7b342dece513174b574bd
Component: engine
 2018-01-03 15:59:06 -08:00
John Howard
fa87c342b2 Vendor Microsoft/hcsshim @ v0.6.8 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 172a442c27ed35778662980809824fdf15a722a6
Component: engine
 2018-01-03 10:19:05 -08:00
Sebastiaan van Stijn
6f3ae5f1f6 Merge pull request #35772 from arm64b/multi-arch-manifest-support 
Download support of images with multi-arch manifest
Upstream-commit: fda904911d87a2b36e6fdcc048726bb6b593d944
Component: engine
 2018-01-03 19:03:33 +01:00
Brian Goff
707c5a8bd6 Merge pull request #35694 from boucher/checkpoint-dir-fix 
Don't append the container id to custom directory checkpoints.
Upstream-commit: f72b180ae1f638b878edfbae1b7030f454bb5624
Component: engine
 2018-01-03 11:22:21 -05:00
Yong Tang
01e7ddaec8 Merge pull request #35822 from keyolk/35709-fix-docker-build-overlayfs-whiteout 
skip container ID remapping, if the file is overlayfs whiteout.
Upstream-commit: 99c22b0034605d283d9ddcfc72b1f450d130c976
Component: engine
 2018-01-03 22:21:00 +08:00
Chanhun Jeong
2bb414da6f skip container ID remapping, if the file is overlayfs whiteout. 
Signed-off-by: Chanhun Jeong <chanhun.jeong@navercorp.com>
Upstream-commit: b013c1541d3b58f736bc79269aa88d3bfacda6ea
Component: engine
 2018-01-03 17:06:59 +09:00
Brian Goff
49ff2398e6 Merge pull request #35840 from kolyshkin/misc-test 
Misc test improvements
Upstream-commit: c345c53859a7197deb4722ad4ca5c4a45fab7074
Component: engine
 2018-01-02 09:14:20 -05:00
Sebastiaan van Stijn
3b99478053 Merge pull request #35895 from javabrett/docs-contributing-moby-docker-paths 
Fixed in-container paths in dev doc: moby/moby -> docker/docker.
Upstream-commit: 30c9cb1ead17e861ad666a25116da64e89dc8594
Component: engine
 2018-01-02 13:30:19 +01:00
Sebastiaan van Stijn
42bcb27498 Merge pull request #35893 from thaJeztah/cleanup-mailmap 
Cleanup mailmap, and update authors
Upstream-commit: ff61d127fe8f39ed1bd888e4dbd3d8c14efc1a03
Component: engine
 2018-01-02 12:50:43 +01:00
Sebastiaan van Stijn
8e9edf70c7 Cleanup and sort .mailmap 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 63c86ad2eade7d0d5128100a6eb1d5cac245adbc
Component: engine
 2018-01-02 12:48:14 +01:00
Sebastiaan van Stijn
5b7cd70f03 Update mailmap and authors 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2df19b7c11349b961455b1c75b655a5f017dd7a4
Component: engine
 2018-01-02 12:47:47 +01:00