docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
27,646 Commits 12 Branches 297 Tags
707bb1cca62316990e691d8e75f4a8a2d18fb7a8
Commit Graph

27646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alexchen
707bb1cca6 add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT CONFIG_IP_VS_RR in contrib/check-config.sh 
Signed-off-by: alexchen <alexchenunix@gmail.com>
Upstream-commit: 4c74469d30a71c53cc6b309a3c0048191b1ac008
Component: engine
 2016-10-01 09:50:17 +08:00
Michael Crosby
508d829cee Merge pull request #26968 from darrenstahlmsft/TestEventsFix 
Limit conccurent container creates in TestEventsLimit to 8
Upstream-commit: 18338427ed4573a1b4bcf57654dac59e6da6c215
Component: engine
 2016-09-30 16:29:01 -07:00
Brian Goff
859a595848 Merge pull request #27075 from tonistiigi/copy-error-reporting 
Fix error reporting in `CopyFileWithTar`
Upstream-commit: 6de38ebc4dfbea0f4a805a6baee109b4c830c272
Component: engine
 2016-09-30 18:14:13 -04:00
Darren Stahl
4136664b0a Limit conccurent container creates in TestEventsLimit to 8 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 728a26519051561da7d0310911831955fa42b1d5
Component: engine
 2016-09-30 14:44:05 -07:00
Sebastiaan van Stijn
465b6ed553 Merge pull request #27049 from dnephin/fix-label-flag-type 
Use ListOpt for build labels
Upstream-commit: 1b944a3025ba1eb1bfb86ed6393b7fe33de40eb6
Component: engine
 2016-09-30 23:40:08 +02:00
Tonis Tiigi
5f25d3f4ea Fix error reporting in CopyFileWithTar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 57e12037ac8f8eb48cc05979c3030853d011dfea
Component: engine
 2016-09-30 11:46:37 -07:00
Brian Goff
7f3def0be4 Merge pull request #27072 from Microsoft/jjh/fix26843 
Windows: Don't resolve volume dest
Upstream-commit: d89fb40e1ce1373e3b188b9a817fcf9a5f37cd13
Component: engine
 2016-09-30 14:46:07 -04:00
Michael Crosby
f44fc82a36 Merge pull request #26961 from Microsoft/jjh/oci 
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
 2016-09-30 10:13:57 -07:00
Michael Crosby
1e2592ec36 Merge pull request #26997 from tonistiigi/exec-env 
Fix missing hostname and links in exec env
Upstream-commit: 6eef2b2ada0ee7657b3821af055d8fb337d682f4
Component: engine
 2016-09-30 09:51:02 -07:00
John Howard
e59d7b9406 Windows: Don't resolve volume dest 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3838c314add208a57003611a6963784435863330
Component: engine
 2016-09-30 09:40:15 -07:00
Justin Cormack
dc025b4907 Merge pull request #27051 from tophj-ibm/fix-installing-apparmor 
Fix apparmor profile installation
Upstream-commit: 50856a2ce29a8cd4ecd22a3ba8f6274c2ba6977c
Component: engine
 2016-09-30 17:38:20 +01:00
Vincent Demeester
fc5500f19e Merge pull request #26697 from allencloud/change-service-scale-logic 
validate service parameter in client side to avoid api call in `docker service scale`
Upstream-commit: 4fabc92cfc0670851851ebfb0f12d037059e6be1
Component: engine
 2016-09-30 18:37:35 +02:00
Vincent Demeester
0ffd096b11 Merge pull request #27059 from yongtang/26964-docs-service-ps-filter-misc 
Update docs for node filter of `docker service ps`
Upstream-commit: c9a0dda586481ec7acdeec36497ba726475059ad
Component: engine
 2016-09-30 16:15:49 +02:00
Yong Tang
3f16b8db80 Update docs for node filter of docker service ps 
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.

This fix updates the related docs for that.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c326e0afe39d19a789f0819cb3d81259167a762f
Component: engine
 2016-09-30 05:37:14 -07:00
Christopher Jones
c15d8c9103 Fix apparmor profile installation 
Fixes #26823

Fixes an issue where apparmor was not loaded into the kernel, because
apparmor_parser was being called incorrectly.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 1a702111c61076e14f0e7ae688d0102128233daf
Component: engine
 2016-09-29 18:47:20 -05:00
Daniel Nephin
373fe94987 Use ListOpt for labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6c3b44f755cbf2564171a012fc55942862f3ede9
Component: engine
 2016-09-29 17:59:52 -04:00
Tonis Tiigi
3616bb2973 Fix missing hostname and links in exec env 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e98145960988a2259074ae911b6478b7a940748b
Component: engine
 2016-09-29 13:46:10 -07:00
Michael Crosby
200598ef34 Merge pull request #26994 from Microsoft/jjh/fix26461regression 
Windows: Don't set PATH/TERM on exec
Upstream-commit: 1d669d82c1d5691f9706112acdbe4f70812cf6aa
Component: engine
 2016-09-29 13:34:12 -07:00
Misty Stanley-Jones
12eed3d798 Merge pull request #27036 from mstanleyjones/fix_labels_nav 
Fix menu position of the labels-custom-metadata.md topic
Upstream-commit: a3286783bcfbfd6e58d16e1b189138580b08facc
Component: engine
 2016-09-29 11:04:46 -07:00
Misty Stanley-Jones
1b063e8490 Fix menu position of the labels-custom-metadata.md topic 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 9e012210484b3adda78e872bb45c54956d108c13
Component: engine
 2016-09-29 10:51:08 -07:00
Sebastiaan van Stijn
e521f9c3b8 Merge pull request #27031 from mstanleyjones/fix_broken_image_link 
Revert "Add direct link to event chart image"
Upstream-commit: 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23
Component: engine
 2016-09-29 19:21:30 +02:00
Misty Stanley-Jones
54d60e9c2d Revert "Add direct link to event chart image" 
This reverts commit 86de72fef244b3fe209e5793deb40fb26f5b318e.

The link seems malformed and is breaking the overall docs build.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 23207def7c4a390fe3549f467413c187cc146fee
Component: engine
 2016-09-29 10:16:41 -07:00
Vincent Demeester
a3bb730c44 Merge pull request #24411 from vdemeester/24393-ps-filter-managed 
Add a new "is-task" ps filter
Upstream-commit: b6ad6d98fd5037c44cc38d000e5a35bd808bff7d
Component: engine
 2016-09-29 18:54:15 +02:00
Tõnis Tiigi
f5d10e642f Merge pull request #27007 from allencloud/better-node-inspect-pretty 
add \n in engine labels display in docker node inspect xxx --pretty
Upstream-commit: c29eee6e20b7818e8abf749fe57c46fa3d865f94
Component: engine
 2016-09-29 09:53:59 -07:00
Tõnis Tiigi
e79106b452 Merge pull request #27024 from LK4D4/fix_servic_healthtest 
integration: wait for task running in TestServiceHealthRun
Upstream-commit: 5bfe493d93239d20c37695ae4df532a1f8ae16b1
Component: engine
 2016-09-29 09:53:02 -07:00
Alexander Morozov
3fec85512c integration: wait for task running in TestServiceHealthRun 
Test can miss Starting state, so wait until its Running

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2de05de98dc096de9e774aa5b520ab8f6862de0c
Component: engine
 2016-09-29 07:44:00 -07:00
allencloud
8493b1e3af add \n in engine labels display in docker node inspect xxx --pretty 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ddec4c3ee4e51cb62060f752777bdd32e86607e3
Component: engine
 2016-09-29 18:17:54 +08:00
Sebastiaan van Stijn
3e0303bb32 Merge pull request #27001 from mstanleyjones/fix_broken_build 
Fix link to non-existent file
Upstream-commit: ad398f132ba9708cf4a7a60ef5a4e7f5b566b000
Component: engine
 2016-09-29 08:39:26 +02:00
Sebastiaan van Stijn
cd2885f204 Merge pull request #26999 from andrewhsu/test-exit-code-125 
integration test for missing arg error code
Upstream-commit: bc0465d2bec1dbb47ffb0d77a16cd3f9d2c7237c
Component: engine
 2016-09-29 08:38:19 +02:00
Misty Stanley-Jones
3f1e962107 Fix link to non-existent file 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ca04f02d7655e7306c7c0cde6fa1895a14f0a673
Component: engine
 2016-09-28 20:34:26 -07:00
Andrew Hsu
aa6c254ed2 integration test for missing arg error code 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 64b5fe76cff87784124a3d2d824d99ec9ce3b5c2
Component: engine
 2016-09-28 16:33:45 -07:00
John Howard
c01ac0b550 Windows: Don't set PATH/TERM on exec 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e880bbc48bd94762489a9948814d3edea39fdcfa
Component: engine
 2016-09-28 13:42:27 -07:00
Vincent Demeester
ac8256a95d Merge pull request #26972 from allencloud/clear-health-monitor-log 
make health check log more readable
Upstream-commit: 601004e1a714d77d3a43e957b8ae8adbc867b280
Component: engine
 2016-09-28 14:22:43 +02:00
Sebastiaan van Stijn
8a19fb43a4 Merge pull request #26941 from runcom/docker-init-path-1 
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
 2016-09-28 13:12:59 +02:00
Vincent Demeester
48a609d72c Add a new "is-task" ps filter 
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
 2016-09-28 12:45:30 +02:00
Vincent Demeester
f6b8936533 Merge pull request #24850 from yongtang/24270-service-tasks-filter 
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
 2016-09-28 11:50:27 +02:00
allencloud
a7102311d0 make health check log more readable 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a4a4f3733f18053269293d6f2e56767c564940d3
Component: engine
 2016-09-28 14:10:15 +08:00
Yong Tang
d295583beb Update docs for service ps 
This fix updates docs for `service ps` as now the TASK ID part has been
removed.

Also, this fix fixes several incorrect sample output.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 880a5f565fb33b445977bb2ded0fc375edee0c40
Component: engine
 2016-09-27 19:12:48 -07:00
Brian Goff
66d6bcea36 Merge pull request #26951 from AkihiroSuda/update-ut-cli-command-service 
Fix cli/command/service/opts_test.go, and add some extra test cases
Upstream-commit: 9a2f01ef13e4bb54813aa548c2d44a8e3bafecd2
Component: engine
 2016-09-27 20:30:26 -04:00
Misty Stanley-Jones
048d1e7728 Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
Upstream-commit: bab64af2ad0d6f5e7c1e9d54b2f6d93096f7b99f
Component: engine
 2016-09-27 17:06:01 -07:00
Misty Stanley-Jones
10fe66aea1 Merge pull request #26963 from londoncalling/docs-swarm-d4mac-d4win 
added better Docker Machine links to Swarm tutorial d4mac, d4win, cop…
Upstream-commit: 456e6fe4aa9804b278e136a395d5d4b6dd766763
Component: engine
 2016-09-27 14:59:26 -07:00
Victoria Bialas
95fdcb0f29 added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc
Component: engine
 2016-09-27 14:21:17 -07:00
Sebastiaan van Stijn
393b93c599 Merge pull request #26957 from dnephin/add_more_areas 
Add area/bundles to the list of area labels
Upstream-commit: 784b601bbd432c710db1a6205b5ac712812dbab5
Component: engine
 2016-09-27 22:01:51 +02:00
John Howard
434bea436a Remove hacked Windows OCI spec, compile fixups 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 02309170a5fb97d40260d0ee9e24b44be8c780b2
Component: engine
 2016-09-27 12:07:35 -07:00
John Howard
2028ec4919 Revendor OCI runtime-spec 1c7c27d043c2 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba2df174935b5119f336e7f3ab5228cd41279791
Component: engine
 2016-09-27 12:05:47 -07:00
Sebastiaan van Stijn
e2b3c90bc3 Merge pull request #26955 from albers/completion-fix-logs--since 
Fix bash completion for `docker logs --since`
Upstream-commit: e8dc339d43e3bccf48a90ef14ac5e6f05f72a478
Component: engine
 2016-09-27 20:06:40 +02:00
Daniel Nephin
63b81800ef Add area/bundles tothe list of area labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b94d429f19b900850c3c4a91083d87dc190d4b98
Component: engine
 2016-09-27 13:18:53 -04:00
Victor Vieux
09c1674077 Merge pull request #26952 from andrewhsu/cherry-pick-flags 
Specify git cherry-pick flags for release process.
Upstream-commit: 95030c26e41d8120d00ce44299599c27ef7b1de2
Component: engine
 2016-09-27 10:08:01 -07:00
Harald Albers
9c391e0cdf Fix bash completion for docker logs --since 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e2244352a79f5d23cf874d72b6abed9be2da9f8
Component: engine
 2016-09-27 18:58:48 +02:00
Vincent Demeester
be83d1256c Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress 
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
 2016-09-27 18:48:03 +02:00