toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,983 Commits 3 Branches 295 Tags
d4d13b919a1dcea3909ce6fdc20059e9b8110fa0
Commit Graph
21983 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester d4d13b919a Merge pull request #19962 from marsmensch/doc_breaking_formatting_fix 
Fix formatting in breaking changes doc
Upstream-commit: 9123a24cc8218e5222c2c4f4c9153d6971f3d128
Component: engine
 2016-02-03 20:43:52 +01:00
Alexander Morozov 3f8eca9ec3 Merge pull request #19943 from aboch/ec 
Store endpoint config on network connect to a stopped container
Upstream-commit: 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e
Component: engine
 2016-02-03 11:06:35 -08:00
Alexander Morozov d9ed04ff60 Merge pull request #18680 from aaronlehmann/duplicate-pull-complete-message 
Avoid outputting last progress item twice
Upstream-commit: bce70cdc2c4f80e75ca7435e2f3016b904b5c3f2
Component: engine
 2016-02-03 11:01:45 -08:00
Jess Frazelle a2f4392bb3 Merge pull request #19870 from hqhq/hq_sync_Dockerfile 
Sync with Dockerfile
Upstream-commit: ea28ca435074f2f756cfd553b172df27a8121e29
Component: engine
 2016-02-03 10:57:36 -08:00
Alexander Morozov 5649ae9668 Merge pull request #19959 from WeiZhang555/fix-cli-print-err 
Remove redundant error message
Upstream-commit: 28a7577a029780e4533faf3d057ec9f6c7a10948
Component: engine
 2016-02-03 10:56:19 -08:00
Florian Maier 0abee8411c Fix formatting in breaking changes doc 
Signed-off-by: Florian Maier <contact@marsmenschen.com>
Upstream-commit: f0df677913ce9bc6da5253dcca62690917923a3c
Component: engine
 2016-02-03 19:22:14 +01:00
Phil Estes 553379f1b3 Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error 
user namespaces: duplicate dot in user namespaces error message
Upstream-commit: b2c162a0b34ac0c5caaa1f30b1a3a7d6844b83a9
Component: engine
 2016-02-03 12:51:51 -05:00
Phil Estes 8303acb47b Merge pull request #19964 from vdemeester/factor-prefix-and-slash-platform 
Add a getPrefixAndSlashFromDaemonPlatform …
Upstream-commit: e3f96b093a3a19044d2a0d096571f22c1317c8e3
Component: engine
 2016-02-03 11:16:29 -05:00
Vincent Demeester 71738b2706 Merge pull request #18966 from mariusGundersen/machine-readable-state 
Expose the machine readable state of a container when listing containers
Upstream-commit: 98c4f0bbc3580df2b1dabde513e9aa97362fa3cc
Component: engine
 2016-02-03 16:41:45 +01:00
Liron Levin d672770336 user namespaces: duplicate dot in user namespaces error message 
duplicate dot in user namespaces error message:

$ docker run -ti --net=host ubuntu /bin/bash
docker: Error response from daemon: Cannot share the host or a
container's network namespace when user namespaces are enabled..

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 858f852da48a7d075cbc5139356a36ac975bf10f
Component: engine
 2016-02-03 16:56:34 +02:00
Vincent Demeester 3e36908d7b Add a getPrefixAndSlashFromDaemonPlatform … 
… to limit code duplication in integration tests :P

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 382c96ee7b02f393e7515e4cc4882738398b86a6
Component: engine
 2016-02-03 15:16:00 +01:00
Vincent Demeester 7f7ec57612 Merge pull request #19948 from Microsoft/jjh/testclirm 
Windows CI: Port docker_cli_rm_test.go
Upstream-commit: bc082033147418c9d2b45dad104f84e8a6d29ae9
Component: engine
 2016-02-03 15:05:21 +01:00
Sebastiaan van Stijn 3d7b972d74 Merge pull request #19961 from coolljt0725/check_nil 
1.10.0-rc3: Check nil before set resource.OomKillDisable
Upstream-commit: f37e10aee3e23f60bc3d964dd9004c371d8f1371
Component: engine
 2016-02-03 14:52:18 +01:00
Sebastiaan van Stijn e9b0659a70 Merge pull request #19947 from Microsoft/jjh/testclistart 
Windows CI: Port docker_cli_start_test.go
Upstream-commit: 0736dba624e616d8b8af26f03ea1a438535e8dc1
Component: engine
 2016-02-03 13:40:55 +01:00
Qiang Huang 27af1fc1fb Sync with Dockerfile 
Add support for seccomp and buildpack-deps, and
updated some commit numbers.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: d8d47f428d3a37dd758e3bd714024f6be4df3707
Component: engine
 2016-02-03 12:09:52 +00:00
Sebastiaan van Stijn c0abf32b68 Merge pull request #19914 from coolljt0725/fix_top_restart 
Fix docker top a restarting container
Upstream-commit: b75d0929b1df1481a928531102531a38f143ad49
Component: engine
 2016-02-03 11:28:10 +01:00
Lei Jitang fc2d98659e Check nil before set resource.OomKillDisable 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 09a33b5f60557ee3846baa48f5628bc6b8a70a9b
Component: engine
 2016-02-03 04:31:00 -05:00
Vincent Demeester 5f2192d684 Merge pull request #19946 from Microsoft/jjh/stats 
Windows: Turn off stats
Upstream-commit: 4ef06e9ef18e7538c71818175d3228ba65c00b64
Component: engine
 2016-02-03 09:28:25 +01:00
Vincent Demeester 90f951a226 Merge pull request #19940 from bfirsh/add-1.10-migration-docs 
Add 1.10 migration docs
Upstream-commit: 052e5f222e5c422b31160255b499a298b9b89898
Component: engine
 2016-02-03 08:52:17 +01:00
Sebastiaan van Stijn b997758191 Merge pull request #19951 from icecrime/18546_carry 
Carry #18546
Upstream-commit: f3263201ab923335c729d17d1aebb66fbbc628aa
Component: engine
 2016-02-03 08:51:54 +01:00
Zhang Wei 68f96de053 Remove redundant error message 
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 894266c1bbdfeb53bf278f3cb762945bac69e592
Component: engine
 2016-02-03 15:45:20 +08:00
David Calavera 4d72f6a443 Merge pull request #19945 from amitkris/master 
bump logrus to v0.9.0
Upstream-commit: d2bc2f081f12f2f5549a059133c9bf86c02ea486
Component: engine
 2016-02-02 21:10:30 -08:00
Arnaud Porterie 1db323c65a Merge pull request #19954 from Microsoft/jjh/disableclientsetstls 
Disable flakey TestClientSetsTLSServerName
Upstream-commit: fa160753c176e18bd0c1610317d62b888f1d234c
Component: engine
 2016-02-02 20:09:16 -08:00
John Howard 298796a142 Disable flakey TestClientSetsTLSServerName 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6b8341a2d529ff6489e77ef6d496a2054af31cd5
Component: engine
 2016-02-02 19:56:31 -08:00
Arnaud Porterie 856f16871a Fix typo 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 2fd35de274fa25d5031756eb5fdf3f3240bc4d9d
Component: engine
 2016-02-02 19:07:58 -08:00
Troy Denton 51e3bc5e37 Update networkingcontainers.md 
updated line on how to exit the container after the ping test - in my environment (Ubuntu 14.04.1, bash) ctrl-c does not work to exit the shell, and `exit` must be used instead.

Signed-off-by: Troy Denton <Troy.Denton@younessleeptechnologies.com>
Upstream-commit: 0e147547660c830e5ea33a0b9a0281e64256efab
Component: engine
 2016-02-02 19:05:55 -08:00
John Howard cc8995d14c Windows CI: Port docker_cli_rm_test.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 07fd173225408342de76f749c2a5bccadec32d3a
Component: engine
 2016-02-02 18:43:50 -08:00
John Howard 40c9bed676 Windows CI: Port docker_cli_start_test.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b47749102d8bfde1ec6f87b2cd291b8f45146b67
Component: engine
 2016-02-02 18:23:29 -08:00
Lei Jitang 0c9780ee15 Fix docker top a restarting container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5566ccb7aa0747005573f6f4f04f46552b75a394
Component: engine
 2016-02-02 21:05:01 -05:00
John Howard cf751d8144 Windows: Turn off stats 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 55268f4e9158738631f04e7e4becf39c9043b60a
Component: engine
 2016-02-02 17:59:11 -08:00
Ben Firshman 778c933054 Add 1.10 migration docs 
Originally from https://blog.docker.com/2016/01/docker-1-10-rc/

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: c8f263c73d0f3efd1834427346b3c5b170fcdab5
Component: engine
 2016-02-02 17:54:33 -08:00
Amit Krishnan 79d176ce8a bump logrus to v0.9.0 
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
Upstream-commit: 408092e56b7859d54138e82575a33bcfcb5fcaad
Component: engine
 2016-02-02 17:53:51 -08:00
Arnaud Porterie 2a82c3d7ca Merge pull request #19939 from Microsoft/jjh/testcreate 
Windows CI: TestCreate* porting
Upstream-commit: 6f88a3d7d3f51c643667f437539ed75ad569688c
Component: engine
 2016-02-02 17:48:43 -08:00
Alessandro Boch 2b5317f067 Store endpoint config on network connect to a stopped container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 9b63e4e7f5a02efa89d8bc91e1cb5e4cada60093
Component: engine
 2016-02-02 17:25:44 -08:00
Alexander Morozov d23aa0257d Merge pull request #19935 from Microsoft/jjh/onemorereliabilityhack 
Windows CI: One more reliability hack
Upstream-commit: c2bf90eb59d1d9e7565ba381d4c86bd48d9c36d0
Component: engine
 2016-02-02 16:49:29 -08:00
Alexander Morozov d2d1dc51de Merge pull request #19761 from HackToday/enhancesortattr 
Sort the attributes for events
Upstream-commit: 1bc4c99372fa458c70eeb411575a1c538912521d
Component: engine
 2016-02-02 16:08:23 -08:00
John Howard c3a476e4f1 Windows CI: TestCreate* porting 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5e3fdd3c20900b5db5895fee85f5ff11744a9bea
Component: engine
 2016-02-02 16:00:39 -08:00
Alexander Morozov 43913f9547 Merge pull request #19911 from Microsoft/jstarks/npipe 
Windows: Add support for named pipe protocol
Upstream-commit: 83ee24e52b04fd8cf1f7366dff04baa43d89ec49
Component: engine
 2016-02-02 15:59:45 -08:00
Arnaud Porterie 151776465a Merge pull request #19901 from calavera/debug_cli_tests 
Always show debug information in the info output
Upstream-commit: 85a32baa3be8a5f2e9dd5262e03726fe9d4d52b3
Component: engine
 2016-02-02 15:56:55 -08:00
Arnaud Porterie 9615203fd9 Merge pull request #19915 from wenchma/add_net_bind_test 
Add integration test for network host bind option
Upstream-commit: 5ba3edd4862a3308ff4863d4aef049159b4d31c8
Component: engine
 2016-02-02 15:34:13 -08:00
Antonio Murdaca 2f29f9f7fc Merge pull request #19936 from vieux/fix_min_version 
fix error message on version too low
Upstream-commit: 2a35a1a6dc3cdb68ac98a2f9fdb53f4889b339d7
Component: engine
 2016-02-03 00:21:07 +01:00
Alexander Morozov fd18daf360 Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats 
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
Upstream-commit: 01cc315322597a00b3f82da140d922a6ebc5b7b3
Component: engine
 2016-02-02 14:56:51 -08:00
Alexander Morozov 2d432f910a Merge pull request #19917 from WeiZhang555/add-lock 
Lock container when set state to restarting
Upstream-commit: 67d6154cc26cceccc554ebb54ae4dcbad44047e4
Component: engine
 2016-02-02 14:55:51 -08:00
Victor Vieux d7248ffec7 fix error message on version too low 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0fd9b4067d5126a8059dc2821b835d3bde26e7eb
Component: engine
 2016-02-02 14:16:15 -08:00
David Calavera 46e42d4581 Add regression tests for client debug flag. 
- Add client debug info to the `docker info` command.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9f315dd328a33b51133a41067a508a8b59166a39
Component: engine
 2016-02-02 16:57:36 -05:00
John Howard 9dd09cab07 Windows CI: One more reliability hack 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 14c53160d7477813839f6996cf340004ebe335c5
Component: engine
 2016-02-02 13:15:35 -08:00
Tibor Vass 794f697ccd Merge pull request #19932 from calavera/fix_config_validation 
Make sure flat options are not parsed as config structures.
Upstream-commit: b6a6ed7200281a2c2d0ca0824e69beb7240e6ddd
Component: engine
 2016-02-02 15:36:25 -05:00
David Calavera bfd1c80469 Make sure flat options are not parsed as config structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b6766e3063dccfc58c0ab1cfc9687cfa2947be6a
Component: engine
 2016-02-02 14:45:37 -05:00
Brian Goff 5e084d01fe Merge pull request #19927 from jfrazelle/update-comment 
update comment
Upstream-commit: 51620020aff6f31447a71a5a66af0066c524649a
Component: engine
 2016-02-02 14:37:43 -05:00
Arnaud Porterie 0c5fc842f1 Merge pull request #19926 from Microsoft/jjh/refixcihack 
Windows CI: Re-do TP4 CI reliability hack
Upstream-commit: 6b7a3f0c827163df13cff78a8ee45337b56003e1
Component: engine
 2016-02-02 11:02:08 -08:00