Commit Graph

24724 Commits

Author SHA1 Message Date
87fa5c341b Update containerd to cf554d59dd96e459544748290eb91
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d17b9f3da064f4c7e70867be5e64d06b127df301
Component: engine
2016-06-07 15:27:23 -07:00
65f4a3fb13 Merge pull request #23311 from WeiZhang555/cobra-rm
Migrate rm command to cobra
Upstream-commit: ce96ce9e05d9b312b5454237680abadc7aa51092
Component: engine
2016-06-07 17:05:21 -04:00
41742b0589 Merge pull request #23292 from yongtang/23211-spf13-cobra-images
Use spf13/cobra for docker images
Upstream-commit: 08419313ec51b4e9c7db9e12c01cc6eea6cb8f16
Component: engine
2016-06-07 21:56:42 +02:00
819862b983 Merge pull request #23278 from yongtang/23211-spf13-cobra-tag
Use spf13/cobra for docker tag
Upstream-commit: 55a8bfa0e863c6399021ac4bf0bb7ca130debe16
Component: engine
2016-06-07 21:55:29 +02:00
d90920d0d6 Merge pull request #23349 from albers/completion-ps-filter-network
bash completion for `docker ps --filter network`
Upstream-commit: 9d139e50bc967aa4573608c5f38189bf3933043f
Component: engine
2016-06-07 21:54:58 +02:00
0429c63978 bash completion for docker ps --filter network
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 337eaab5d1bf024dc3299e6b70a575623886e063
Component: engine
2016-06-07 12:44:17 -07:00
fbb8bd9e59 Merge pull request #23338 from vdemeester/23253-fix-create-run
Fix create command flags
Upstream-commit: 8cd6977f98f4f51ee110a9795d1d93b9ec4b166c
Component: engine
2016-06-07 10:46:45 -07:00
67251cd308 Merge pull request #23300 from thaJeztah/carry-22894-ps_filter_network
[carry 22894] Adding network filter to docker ps command
Upstream-commit: 06a204c314814c8d022a03ed187a11d8b26062c6
Component: engine
2016-06-07 19:18:51 +02:00
e336aa95df Merge pull request #23328 from swernli/servicingFix
Fix postRunProcessing behavior during docker build
Upstream-commit: cc03a422aaa976568dcb423ebb518b0c40e9e66a
Component: engine
2016-06-07 09:49:28 -07:00
298b0e2df9 Use spf13/cobra for docker tag
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker tag` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ba7324ffcb23ba314fbab335a816004c4af7f3f3
Component: engine
2016-06-07 08:12:49 -07:00
bade101cf9 Use spf13/cobra for docker images
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker images` to use spf13/cobra

NOTE: As part of this fix, a new function `RequiresMaxArgs()`
has been defined in `cli/required.go`. This func returns an
error if there is not at most max args

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 65a0034c67dbcc9e7a2baf285fca7d2435b689a3
Component: engine
2016-06-07 08:10:49 -07:00
94abb34940 add support for filtering by network ID
This adds support for filtering by network ID, to be
consistent with other filter options.

Note that only *full* matches are returned; this is
consistent with other filters (e.g. volume), that
also return full matches only.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7c46ba02e694ae540866b29ebf0dab76e556cc13
Component: engine
2016-06-07 16:50:31 +02:00
4e024e3e7d Adding network filter to docker ps command
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Upstream-commit: 912af1ae8f22c4d9d7e478d0985a40b41ded2027
Component: engine
2016-06-07 16:43:11 +02:00
4d60d70438 Merge pull request #23340 from thaJeztah/fix-TestRenameInvalidName
Fix TestRenameInvalidName
Upstream-commit: a01ae049f982811c2e6d9a25a6c595bcd2fb7d32
Component: engine
2016-06-07 16:40:14 +02:00
238e9facc6 Migrate rm command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7702f39fe8e642dbaede34af09472f5aea66a795
Component: engine
2016-06-07 22:19:16 +08:00
3cb88d591b Fix TestRenameInvalidName
Change the test back to what it was before
e83dad090a1e890ac870808d776fa584276bf7ab

And added an extra test-case to check the
output if an incorrect number of arguments
is passed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 085f41b6a5764cba33fb5bda387f8ebe165d5828
Component: engine
2016-06-07 15:42:48 +02:00
593816f86f Merge pull request #23307 from WeiZhang555/cobra-restart
Migrate restart command to cobra
Upstream-commit: 88323c861a70f94b88870b7614bc91d2fdfd98e0
Component: engine
2016-06-07 15:28:35 +02:00
a25abf1b60 Fix create command flags
Any command that expects extra flags after positional args needs to set flags.SetInterspersed(false).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aa00520fc8bb4e04c37c2eb41f3bc3558deab533
Component: engine
2016-06-07 14:11:11 +02:00
8dabf407a1 Merge pull request #23297 from WeiZhang555/cobra-kill
Migrate kill command to cobra
Upstream-commit: 4f9e2f9fb4a3b6594a8ae094eeb3494d6b6ef2f9
Component: engine
2016-06-07 13:44:22 +02:00
08ad8f3172 Merge pull request #23269 from vdemeester/migrate-import-to-cobra
Use spf13/cobra for docker import
Upstream-commit: f061f556f2d3819f293e76a434c8212d613eca6b
Component: engine
2016-06-07 13:07:30 +02:00
fcec050c14 Merge pull request #23236 from runcom/fix-spec
Fix spec and man
Upstream-commit: 8e63de1f63ac6bb8b0eefad4836599255d1eaea6
Component: engine
2016-06-07 12:54:42 +02:00
54aa4a7bec Merge pull request #22149 from vdemeester/deprecated-copy-endpoint
Deprecate /containers/(id or name)/copy endpoint
Upstream-commit: 148d2b8e4a7e4f669ba9e8db2adc2413fde27a07
Component: engine
2016-06-07 12:50:04 +02:00
582dec773d Merge pull request #23172 from michael-holzheu/PR-s390x-seccomp
Enable seccomp for s390x and ppc: s390x part
Upstream-commit: eb6b5a6448efe7a9450abb98f9a0ea1c4cf51913
Component: engine
2016-06-07 12:04:13 +02:00
5680e33f57 Migrate kill command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 732f08a822567aedeb9c9b27a84d8028c9ebb365
Component: engine
2016-06-07 17:20:33 +08:00
118d1a775e Migrate restart command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 264462d601ecd5d5e0d9e063e3d380a1e47d470a
Component: engine
2016-06-07 17:13:53 +08:00
5879215fd4 Merge pull request #23226 from HackToday/fixnetinspectId
Fix the network inspect id
Upstream-commit: f9021838b61f17b2de6c42e459a732652ee2d207
Component: engine
2016-06-07 10:02:17 +02:00
9b4d5c68b5 Merge pull request #23285 from yongtang/23211-spf13-cobra-pause
Use spf13/cobra for docker pause
Upstream-commit: 6d4a7213e66145552af31fa0c88aebdd70eb5700
Component: engine
2016-06-07 10:01:42 +02:00
ec9cb4d4e9 Merge pull request #23291 from yongtang/23211-spf13-cobra-history
Use spf13/cobra for docker history
Upstream-commit: 804536df25fb8b3819a42e88da4fc94b3e449000
Component: engine
2016-06-07 10:00:39 +02:00
d313694ba9 Merge pull request #23290 from yongtang/23211-spf13-cobra-rename
Use spf13/cobra for docker rename
Upstream-commit: e83dad090a1e890ac870808d776fa584276bf7ab
Component: engine
2016-06-07 08:28:27 +02:00
b481265b14 Merge pull request #23331 from yongtang/06062016-docs-typo
Fix a couple of typos in the docs of `docker attach`
Upstream-commit: 3d8fdbb6264c83975bfd36b68e3b67d12a3006c1
Component: engine
2016-06-06 22:39:33 -04:00
45b2203529 Fix a couple of typos in the docs of docker attach
This fix fixed a couple of typos in the docs of `docker attach`:
docs/reference/commandline/attach.md
man/docker-attach.1.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 2e506039ff9f6502670d42570f835c0d51fcda20
Component: engine
2016-06-06 19:06:50 -07:00
e6c6c92dca Merge pull request #23316 from dnephin/error_on_invalid_docker_host
Fix a panic when the DOCKER_HOST was invalid using cobra commands
Upstream-commit: c077d4cc1e2f888d645520d1f7f68619b2f85ecc
Component: engine
2016-06-06 21:17:47 -04:00
69e243a9fc Merge pull request #23274 from WeiZhang555/cobra-attach
Move attach command to cobra
Upstream-commit: ab821f9f9bf15cb7d356c6e48729f706807488db
Component: engine
2016-06-06 21:16:45 -04:00
8a8f6f6124 Fix postRunProcessing behavior during docker build
If Windows updates are being applied via a RUN command in a docker build, the build will not stop if there was a failure in postRunProcessing.  To enable this behavior, we explicitly set the exit code of the container to a failure if postRunProcessing fails during servicing container step.  For completeness, also avoid running servicing operation if the original exit code of the container is non-zero so that original failure exit code does not get overwritten.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 2266e7f2345c88a8e195fd959550d0d657bec843
Component: engine
2016-06-06 18:07:01 -07:00
61f6798519 Merge pull request #23323 from tiborvass/debug-ci
Cleanup
Upstream-commit: afc3cb03f4fc88f2826960a6ba3341a2b1ddeaef
Component: engine
2016-06-06 21:03:30 -04:00
3ff13f560e Merge pull request #22866 from jstarks/foreign_layers
Support layers from external URLs
Upstream-commit: 7d08f3a5ad16446952b9b461feb0895a5c73ea58
Component: engine
2016-06-07 00:27:40 +00:00
545244368d Cleanup
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ccaea227e0e9356ab293610784b635c643e9a15e
Component: engine
2016-06-06 15:57:51 -07:00
83ae608b78 Use spf13/cobra for docker rename
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker rename` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 70f7ccb304f9246bc9c2bfe0e30d3a2bd8fd42f8
Component: engine
2016-06-06 12:39:11 -07:00
13b554cbab Use spf13/cobra for docker pause
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker pause` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 91731706c2c7d7efba78045ff8080f2b38d07c4f
Component: engine
2016-06-06 12:37:18 -07:00
b2aef755f3 Merge pull request #23317 from LK4D4/fix_bytepipe_race
ioutils: fix race in access closeErr in bytespipe
Upstream-commit: 3d80884f3d7d60c51c0ccd6b487ebbeb98d2f7e8
Component: engine
2016-06-06 20:46:01 +02:00
9cd9d4349d ioutils: fix race in access closeErr in bytespipe
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b32478488ce6d373e44bb8a6c9cb986c773ad48e
Component: engine
2016-06-06 11:29:47 -07:00
9d8e920601 Fix a panic when the DOCKER_HOST was invalid using cobra commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 90244abc5bfc3be3f97bef16f15079c4fb96c1ff
Component: engine
2016-06-06 14:17:04 -04:00
812d9d1e28 Merge pull request #23306 from yongtang/23211-spf13-cobra-top
Use spf13/cobra for docker top
Upstream-commit: 5ce2f14f9bd12f1a66ad8f6f75d82d8fa8adc5e0
Component: engine
2016-06-06 10:14:10 -07:00
0c22cb98b8 Merge pull request #23217 from clnperez/speedup-pushfail-tests
test trusted push: use a nonexistant hostname
Upstream-commit: 4f1c5772a8da16ac66fbf838b782af76fa4185a6
Component: engine
2016-06-06 10:12:42 -07:00
92cdf5f459 Merge pull request #23286 from yongtang/23211-spf13-cobra-port
Use spf13/cobra for docker port
Upstream-commit: 52da20b839f0de34c107ca80f3be1df89dcd698c
Component: engine
2016-06-06 18:55:37 +02:00
cfcc9cde2b Fix the network inspect id
This fixes #22231

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 864e362aa05ed2207d71471780068e951fe9d02e
Component: engine
2016-06-06 15:26:07 +00:00
6a387aef09 Use spf13/cobra for docker history
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker history` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a76d387cdaa0b44d7d2b7550c2eb4c0fc53e7a47
Component: engine
2016-06-06 08:03:07 -07:00
9a954be4f2 Move attach command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: eceb8625a94e3504fca7b27d8156bcf11a93bf4f
Component: engine
2016-06-06 22:28:57 +08:00
46902010b1 Merge pull request #23287 from yongtang/23211-spf13-cobra-wait
Use spf13/cobra for docker wait
Upstream-commit: 7a0628e01d72c9caa28e4daaab3d259944e1dfb3
Component: engine
2016-06-06 16:08:40 +02:00
0ca5072a60 Use spf13/cobra for docker top
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker top` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0f3866926763447c247bb24268923b5e50c006e1
Component: engine
2016-06-06 06:38:43 -07:00