starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-10-17 19:31:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,896 Commits 14 Branches 328 Tags
da325a829bf370e8b8a6163ba2050bf013b6c7c7
Commit Graph
25219 Commits
Author SHA1 Message Date
Yong Tang da325a829b Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go 
This fix changes related tests from DockerSuite to DockerDaemonSuite
in `docker_cli_info_test.go`. Previously that was done through `NewDaemon()`.

This fix is related to the comments in:
https://github.com/docker/docker/pull/26115#discussion_r76784977
https://github.com/docker/docker/pull/24533#issuecomment-243420042

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0ce5ef279cee13e92d696ae871fe81de37cec253
Component: engine
 2016-08-30 10:11:01 -07:00
Vincent Demeester 691c290c4d Merge pull request #26123 from cpuguy83/revert_makefile_build_args 
Fix passing custom APT_MIRROR on building Docker
Upstream-commit: 5c2064f890fb1fa5f3642ae135e5145d4bd0ae13
Component: engine
 2016-08-30 17:30:48 +02:00
Anusha Ragunathan 44b8f27e57 Merge pull request #26134 from lixiaobing10051267/masterDockerExec 
Modify use of docker exec command in exec.go
Upstream-commit: 5bd14f88cdb38978c28b015ddc0ce343b72b408b
Component: engine
 2016-08-30 08:27:02 -07:00
Daniel Nephin 1f1420a059 Merge pull request #25214 from allencloud/make-node-ps-default-to-self 
make node ps default to self in swarm node
Upstream-commit: bb1d70da9ad5804794b7aea77abe59fb9e3ac196
Component: engine
 2016-08-30 10:37:20 -04:00
Brian Goff db8a613cf1 Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy 
usage description of docker deploy in md not consistant with go file
Upstream-commit: afd54a1a8645bde7d5d87efc5567ee0d3c788e78
Component: engine
 2016-08-30 10:18:19 -04:00
lixiaobing10051267 0ecc84d963 Modify usage of docker exec command in exec.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 26bd3e8b11dd9ef9a8226341ed04cbc8a58776cc
Component: engine
 2016-08-30 22:14:55 +08:00
Brian Goff 82132c60b7 Pass through build APT_MIRROR as separate var 
DOCKER_BUILD_APT_MIRROR

This allows passthrough of other options like HTTP_PROXY from
DOCKER_BUILD_ARGS to work on all builds (for example,
ensure-syscall-test) when APT_MIRROR is set.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 39c87c79c848456aaa12a6ecfd658a9e94f94d65
Component: engine
 2016-08-30 09:09:31 -04:00
Brian Goff 6e19944380 Merge pull request #25890 from cpuguy83/fix_swarm_control_sock_path 
Use daemon exec root for swarm control socket
Upstream-commit: edafc642b2b12d7428e72f922a2b44c3b62ffc31
Component: engine
 2016-08-30 08:51:52 -04:00
Justin Cormack 1b0ecb4bfa Merge pull request #26096 from ohmystack/fix/docs-dockerd 
Add docs for "--containerd" in dockerd
Upstream-commit: 644cb53b41b49fd750fe9c86e922125ef8156259
Component: engine
 2016-08-30 13:36:50 +01:00
Vincent Demeester d4a3fcb2c8 Merge pull request #26124 from darrenstahlmsft/RestoreLock 
Lock concurrent access to remove map during Daemon restore
Upstream-commit: 4e1eb10cf28c109ca887408155d84a847aa233fc
Component: engine
 2016-08-30 13:06:01 +02:00
allencloud 37e3bbaff0 make node ps default to self in swarm node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
 2016-08-30 17:34:16 +08:00
Vincent Demeester 4cd762346d Merge pull request #25521 from allencloud/modify-vendor-script 
better vendor.sh to break when fail in grep
Upstream-commit: 92da332638597cf424090b16a90435ea4601891a
Component: engine
 2016-08-30 11:26:41 +02:00
Vincent Demeester d43b3ba23f Merge pull request #26093 from yongtang/26090-service-update-with-name 
Fix issue in API `POST /services/(id or name)/update`
Upstream-commit: 6e09e142a17f2686ebb1a906c53cab593a866ed1
Component: engine
 2016-08-30 11:11:08 +02:00
Kris-Mikael Krister 2aa55a3d95 Fix typo in builder.md 
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com>
Upstream-commit: afcfa77dd80defa996d7d0e073d809ac03493f05
Component: engine
 2016-08-30 09:34:10 +02:00
Yong Tang 6b838755f5 Fix issue in API POST /services/(id or name)/update 
This fix tries to address the issue raised in 26090 where
remote API `POST /services/(id or name)/update` cannot
use `name` to update. This is not consistent with the
documentation of the remote API.

This fix fixes this issue by performing a lookup with `getService`
in case `name` instead of `id` is used in API.

This fix adds an integration test to cover the changes.

This fix fixes 26090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 80e3975117161ae4ce00cc34c7e2b70e45ee43c5
Component: engine
 2016-08-29 21:13:53 -07:00
lixiaobing10051267 c6f2532e79 usage description of docker deploy in md not consistant with go file 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 3298bfcb56c17cd2a0e123cb10074bcc73e1bba9
Component: engine
 2016-08-30 11:40:51 +08:00
ohmystack 73a8f8cdeb Add docs for "--containerd" in dockerd 
Signed-off-by: ohmystack <jiangjun1990@gmail.com>
Upstream-commit: cebb9543e1ae2263905562d1c54e380005d5fe4f
Component: engine
 2016-08-30 10:49:39 +08:00
Tõnis Tiigi acf7387ad5 Merge pull request #26112 from tophj-ibm/alphabetize-makefile-targets 
Alphabetize makefile targets
Upstream-commit: 13094ffef91e52f1149f90718ae55833eee21b2d
Component: engine
 2016-08-29 19:00:52 -07:00
Darren Stahl 0e11a21138 Lock concurrent access to remove map during Daemon restore 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: d665ca8dc053838c5d4d284e13c0f166cd51df6b
Component: engine
 2016-08-29 16:58:01 -07:00
John Howard 6db424fe1d Windows: Enable 2 TestAttach* tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 934fe3f73ee2afccfa051ade5487e39bfa9e1718
Component: engine
 2016-08-29 15:57:27 -07:00
John Howard 90c3eb8d8e Merge pull request #26118 from Microsoft/jjh/golintfixes 
Fix golint errors in api
Upstream-commit: bf3d017f0842c3cc7f65237923604d68ebe01810
Component: engine
 2016-08-29 15:38:55 -07:00
Brian Goff 6564bc722c Merge pull request #25736 from mwieczorek/25689-enable-syslog-driver-on-windows 
Enable syslog driver for windows
Upstream-commit: 2c91c5fdad49ff2103ae377b5b4e1a97ebe3f402
Component: engine
 2016-08-29 17:46:12 -04:00
John Howard 75a4cd19f2 Fix golint errors in api 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c8ce0856b752cecb2f2a2149b79e6e96a63f03dc
Component: engine
 2016-08-29 13:36:16 -07:00
Victoria Bialas ab43397cd4 fixed line spacing in Swarm tutorial bullets 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: dcf00020e14f3f10b32e3d72196d390f3083d2ee
Component: engine
 2016-08-29 11:53:03 -07:00
Christopher Jones b2e9b172d4 Alphabetize makefile targets 
Sorts the makefile targets alphabetically

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: c2775c0b67940467889aa0c20d1be135cbe7623e
Component: engine
 2016-08-29 14:06:45 -04:00
Arnaud Porterie (icecrime) fc1ee92165 Add Anusha and Jana as maintainers 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 1a84f0977b83f0c64365649a308fd0d142901636
Component: engine
 2016-08-29 10:23:50 -07:00
Brian Goff 28302e80b1 Merge pull request #26079 from allencloud/unpause-container-no-running 
remove running judgement when unpause container
Upstream-commit: 4edb83f4fd7f8fc1b1a6fdbef1cd2367a0f5574c
Component: engine
 2016-08-29 10:30:40 -04:00
Brian Goff b901a25ae5 Merge pull request #26086 from icaoweiwei/patch-2016-08-28-3 
Fix typo
Upstream-commit: 4a62f76f9df1400628cb9398f82eb064b6025acf
Component: engine
 2016-08-29 10:28:10 -04:00
Brian Goff edf9053174 Merge pull request #25317 from yongtang/25304-docker-service-create-group 
Support `--group` in `docker service create`
Upstream-commit: d09c04a667fc2895650b0c2bb25e28fb226e3f31
Component: engine
 2016-08-29 10:27:31 -04:00
Brian Goff 383b124a13 Merge pull request #26084 from sdurrheimer/zsh-completion-volume-create-name 
Replace zsh completion for 'docker volume create --name' by 'docker v…
Upstream-commit: ec5aeca38d28b62b0c94799b9fc8e964926080f5
Component: engine
 2016-08-29 10:25:25 -04:00
Brian Goff a67f318b1e Merge pull request #26057 from mwieczorek/fix-25903 
fix for PR #25903 - spec file support for Windows plugin discovery 
Upstream-commit: 3dc19808e01d52b6ebb5e201914863fd6e2d68a2
Component: engine
 2016-08-29 09:53:43 -04:00
Vincent Demeester d155bb2709 Merge pull request #26080 from sw-double/patch-1 
[docs] Fix volume binding in fluentd container example
Upstream-commit: ad73e8f169ee39ed830bfa385583bddd5741012d
Component: engine
 2016-08-29 14:36:49 +02:00
allencloud 17447fd1b0 correct some nits in comment and test files 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 52637848a769b8c80d2f1e28d3d34ada6d35b5a6
Component: engine
 2016-08-29 18:37:14 +08:00
allencloud c944ae9d41 remove running judgement when unpause container 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0bac72e4bd71b01b5315ff60b71d8bcb1a96949a
Component: engine
 2016-08-29 10:16:18 +08:00
Vincent Demeester 97464f18e4 Merge pull request #25990 from vieux/plugin_inspect 
add -f to plugin inspect
Upstream-commit: bf0077c138a1cf64a42828014c44f8e2b2001703
Component: engine
 2016-08-28 17:03:40 +02:00
Cao Weiwei 0647af3a04 Fix typo 
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
Upstream-commit: cec564984eff0d850b9ea5814958cda8996f8d4e
Component: engine
 2016-08-28 21:30:14 +08:00
Steve Durrheimer 87d651a44b Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 85071bda33f5aa3aeee0f9feb371740b21f9c5f9
Component: engine
 2016-08-28 12:40:10 +02:00
Cao Weiwei 76de74a73a Fix typo 
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
Upstream-commit: cdcf7b78fc21f902c2c4fe42812763b0fbb36976
Component: engine
 2016-08-28 17:01:22 +08:00
Konstantin L d2efc6a5c4 Fix volume binding in fluentd container example 
Signed-off-by: Konstantin L <sw.double@gmail.com>
Upstream-commit: c450e608b9b1f79f474dbfb468ab26ae0f741868
Component: engine
 2016-08-28 11:45:28 +08:00
Arnaud Porterie 63926fbdf3 Merge pull request #26055 from mavenugo/ndn 
Support container disconnect for non-existing network
Upstream-commit: 9ea28ea8944744d9dc8f50bdc1733868fda6ce7f
Component: engine
 2016-08-28 01:48:02 +00:00
Tõnis Tiigi df05e493e4 Merge pull request #26068 from allencloud/add-warnings-in-containerCreate 
add warning in containerCreate response
Upstream-commit: 49f51c18feca099685fa6e2f33e644706a7cf122
Component: engine
 2016-08-27 18:47:37 -07:00
Yong Tang bdcdcdfff5 Support --group-add and --group-rm in docker service create/update 
This fix tries to address the issue raised in 25304 to support
`--group-add` and `--group-rm` in `docker service create`.

This fix adds `--group-add` to `docker service create` and `docker service update`,
adds `--group-rm` to `docker service update`.

This fix updates docs for `docker service create` and `docker service update`:
1. Add `--group-add` to `docker service create` and `docker service update`
2. Add `--group-rm` to `docker service update`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b31969ee365f582eb71a7962af9638d79380cd54
Component: engine
 2016-08-27 11:54:05 -07:00
Vincent Demeester 38d8783059 Merge pull request #26036 from yuexiao-wang/add-gcplog 
Add the content for Google Cloud Loging driver in index
Upstream-commit: 48659599cbb4c896e9597e50ae16c087d9dd5ac9
Component: engine
 2016-08-27 14:51:16 +02:00
Vincent Demeester 1647b02210 Merge pull request #25828 from yuexiao-wang/clean-docs 
clean up the run.md in reference
Upstream-commit: 2cec66d0f548a274d723dbdfb27d3fafb6df7ec2
Component: engine
 2016-08-27 14:50:47 +02:00
allencloud f3da2f28dc add warning in containerCreate response 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5d6023cf8ebf6c3097d7a4b88a102a270f0d740d
Component: engine
 2016-08-27 10:49:26 +08:00
Madhu Venugopal 8bee71dfee Support container disconnect for non-existing network 
There are cases such as migrating from classic overlay network to the
swarm-mode networking (without kv-store), such a mechanism to allow
disconnecting a container even when a network isnt available will be
useful.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 05a3f2666ee34c2dfa04663bbdda3c7763b001d8
Component: engine
 2016-08-26 16:48:52 -07:00
Charles Smith 0d384275a3 Merge pull request #26028 from londoncalling/docs-pinata-for-swarm 
Clarify how to use d4mac, d4win with swarm mode
Upstream-commit: 6072e6bfd20598f4e9cb28d32c09bfddec6df76c
Component: engine
 2016-08-26 15:55:26 -07:00
Victoria Bialas ea8723156f WIP:Clarify how to use d4mac, d4win with Swarm mode 
updated d4mac, d4win clarification per Charles's comments

copyedits and streamline wording

fixed links

streamlined, fixed line wraps

incorporated more review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

incorporated more review comments

incorporated more edit comments and fixed line wraps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 566c2c9d3236b0adffaca425db5d4bac66ba8c1c
Component: engine
 2016-08-26 15:42:45 -07:00
Tibor Vass 67ccfbdecc Merge pull request #25424 from vieux/enabled 
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
 2016-08-26 15:22:41 -07:00
Michael Crosby aff46171d8 Merge pull request #26005 from q384566678/branch-test 
Optimize the restart function code
Upstream-commit: 07328cf3f6e2c46ca808fde251d8a1ae85995f01
Component: engine
 2016-08-26 15:14:49 -07:00