toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,148 Commits 3 Branches 295 Tags
beeae010cf5a0b655ad2ae73b6d7473fbcf3e48a
Commit Graph
30148 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lixiaobing10051267 5f3aaff6a0 update URL of plugins_graphdriver.md in experimental/README.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 82eeab62df6e2d62dde4e5f5daefeb4bd2063527
Component: engine
 2016-12-29 10:24:06 +08:00
Brian Goff b4cbe892e8 Merge pull request #29679 from yongtang/29667-docker-build-workdir-cmd 
Fix image's `CMD` after `WORKDIR` in Dockerfile
Upstream-commit: a2b12b5e82d50dad6c4a109501260f2307cf1d75
Component: engine
 2016-12-28 20:26:59 -05:00
Lei Jitang 2ac27c5a50 Follow up #29365, fix fail to remove container after restart 
Call daemon.Mount will increase the refcount of mounted path,
for those previous running containers, `Mount` call will make
the refcount to 2. see
https://github.com/docker/docker/blob/v1.13.0-rc4/daemon/graphdriver/counter.go#L38
```
	if !m.check {
		m.check = true
		if c.checker.IsMounted(path) {
			m.count++
		}
	}
	m.count++

```
graphdrive could restore on reboot after #22541, call
daemon.Mount to resore the graphdriver is not necessary.

And call `daemon.Mount` on restorting will mount all the containers
mounted layer even if it was stop.

This fix call Mount and then Unmount to get `BaseFs`

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 77c725eac2820b3d5b4252f5c25bbf305657d72a
Component: engine
 2016-12-28 20:08:03 -05:00
Sebastiaan van Stijn ae3ac28c23 Merge pull request #29763 from omallo/29729-dostorage-plugin-docs 
Reference new DigitalOcean plugin (Closes #29729)
Upstream-commit: 841968d55cb332816890b969e3e4c1a04a795562
Component: engine
 2016-12-28 23:34:17 +01:00
Ovidio Mallo 9b52afa0bc Reference new DigitalOcean plugin (Closes #29729) 
Signed-off-by: Ovidio Mallo <ovidio.mallo@gmail.com>
Upstream-commit: ed55d71ead3fb80cab4244bed6921f984e52454a
Component: engine
 2016-12-28 23:13:17 +01:00
Yong Tang ee3cf2ce35 Tests to allow ID-based docker plugin enable/disable/rm/set 
This fix is a follow up based on comment:

and a follow up to:
https://github.com/docker/docker/pull/29222#issuecomment-268908937

As #28789 has been merged in, it is possible for `docker plugin inspect`
to search based on Name or ID Prefix. However, ID-based
`docker plugin enable/disable/rm/set` are still not possible.

This fix addes test for  `docker plugin enable/disable/rm/set` to search based on:
- Full ID
- Full Name
- Partial ID (prefix)

The actual fix is done in  #29487.

This fix is a follow up of #28789 and  #29487.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c80e74e8cc28e9b6197e68321f2402c30de3e895
Component: engine
 2016-12-28 14:10:43 -08:00
Vincent Demeester 3e1dc2e4b8 Small cleanup in integration-cli/docker_utils.go 👼 
- Move *one-shot* (one use) function where it is actually used (easier
  to know what's going on).
- Remove `pullImageIfNotExist` function as it might be an artifact
  from way back. We don't need it as we already have frozen/loaded
  image of busybox.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b2320d121ca735a3879b40d493018b2e3a1a52da
Component: engine
 2016-12-28 23:00:32 +01:00
Daniel Nephin 681436c413 Read long description from a file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 78101b26afe4f7edbc4218d49238044e3feef54b
Component: engine
 2016-12-28 16:08:23 -05:00
Daniel Nephin 55c8f05f0d Add validation for compose schema bindata. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 38d08b0bd1a8aa931cefd9caf837dbc9a4bb0a37
Component: engine
 2016-12-28 14:45:44 -05:00
Vincent Demeester 2f9b83d720 Clean integration-cli/utils.go from most of its content 
Most of the code is now on pkg/integration.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: def13fa23c812d367e3c61d9c39bdcee66929c17
Component: engine
 2016-12-28 19:05:48 +01:00
Brian Goff eed726f2d1 Merge pull request #29476 from vdemeester/make-set-container-name 
Add the possibility to set the dev container name
Upstream-commit: 1dece339c3aed9745e5bfe858088a26969a2ee9b
Component: engine
 2016-12-28 12:22:32 -05:00
Alexander Morozov 9d3a22d754 Merge pull request #29313 from vdemeester/move-cli-config 
Move package cliconfig to cli/config
Upstream-commit: 4f657ff55cc91e9196ae980ddf692f763dced271
Component: engine
 2016-12-28 09:05:51 -08:00
Brian Goff 1b913d2b2c Merge pull request #29475 from AkihiroSuda/vendor-oauth2-3 
Vendor gcplogs deps
Upstream-commit: b0aab6e83e9d0235fef99b16a45fd2680995168f
Component: engine
 2016-12-28 11:55:03 -05:00
Brian Goff da7df1bf03 Merge pull request #29684 from vdemeester/quick-unit 
Enhance pkg/{httputils,integration}, distribution/xfer unit tests
Upstream-commit: 631f51015eb2590cab369085dbf262e825b0cf6e
Component: engine
 2016-12-28 10:57:56 -05:00
Brian Goff 859c16a319 Merge pull request #29737 from tonistiigi/fix-rootfs-check 
Fix validation of plugins without rootfs in config
Upstream-commit: c246b02fcaf51cb53f498615203e9042749f3a2a
Component: engine
 2016-12-28 10:49:58 -05:00
Brian Goff 98526f223f Merge pull request #29668 from dmcgowan/plugins-dct 
Support Docker Content Trust for plugins
Upstream-commit: a412c1b7a03e24ba733809924c680f395fad2655
Component: engine
 2016-12-28 10:43:32 -05:00
Doug Davis 22afb90b38 Merge pull request #29752 from allencloud/fix-nits-in-comments 
fix nits in comments
Upstream-commit: 9fab262690a1e9c465687b3dc22f84b053c5624f
Component: engine
 2016-12-28 08:33:48 -05:00
Vincent Demeester 4f858d145b Enhance pkg/{httputils,integration}, distribution/xfer unit tests 
- Make it possible to define a shorter waiting time of httputils
- Make a small hack to reduce the waiting time on distribution/xfer

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 522bfd926bcd8b031019e31cea41ce559cebc9b8
Component: engine
 2016-12-28 11:54:05 +01:00
Sebastiaan van Stijn c23d186bee Merge pull request #29744 from yuexiao-wang/update-docker-ps 
Update the field 'CONTAINER ID' for docker ps
Upstream-commit: 01c62d6e54e49e2c954fb73881ede66ad6fa1b61
Component: engine
 2016-12-28 11:46:06 +01:00
yuexiao-wang e1a6c1f1b2 Update the field 'CONTAINER ID' for docker ps 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b3faa7755a48eb09ba977502fd40e37ab98e1cf8
Component: engine
 2016-12-29 02:00:31 +08:00
Sebastiaan van Stijn 97b5eac4da Merge pull request #29696 from zhenghenghuo/branch-two 
fix some typos
Upstream-commit: 38178cda418ec773e5a272826b676e55b49edb26
Component: engine
 2016-12-28 08:05:43 +01:00
zhenghenghuo 4d710d2209 fix some typos 
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass the test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>
Upstream-commit: f1a19fa8c08a9b68d3a7014f9800cadf40fc150f
Component: engine
 2016-12-28 09:43:27 +08:00
Tonis Tiigi 75dc0839ff Fix validation of plugins without rootfs in config 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6c7cb520094866cacbecb96695aed2d67d8a64a0
Component: engine
 2016-12-27 15:36:12 -08:00
Daniel Nephin edfbbc6ec9 Replace vendor of aanand/compose-file with a local copy. 
Add go-bindata for including the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f5af9b9738892b5988f987ce5fbce6e31a10e768
Component: engine
 2016-12-27 16:17:24 -05:00
Daniel Nephin 5aa0397464 Add deps to test compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 32425d3add046ed2157c4bb36a3b5f2c2402c446
Component: engine
 2016-12-27 16:17:24 -05:00
Derek McGowan 17e3d2d6b6 Support for docker content trust for plugins 
Add integration test for docker content trust

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 14e8bba4f5d39e7a540bee44c133a1e73db48f84
Component: engine
 2016-12-27 12:51:00 -08:00
Brian Goff 96e9f269ff Merge pull request #29666 from tonistiigi/client-deps 
Clean up client binary dependencies
Upstream-commit: bf6eb855391e166a65db284567686fafbe4a9a0a
Component: engine
 2016-12-27 15:01:24 -05:00
Sebastiaan van Stijn b279900e8a Merge pull request #29701 from yuexiao-wang/add-field 
Update 'ID' field for 'docker plugin ls'
Upstream-commit: 823718c3b4b65f966120543bac89ca240cb43f0a
Component: engine
 2016-12-27 20:04:28 +01:00
Brian Goff e23a7bc09c Merge pull request #29716 from yongtang/28885-docker-stack-ps-all 
Remove `docker stack ps -a` to match removal of `docker service/node ps -a`
Upstream-commit: efbb23f3e6c585b64e7898a38b0088a0992ea883
Component: engine
 2016-12-27 13:56:01 -05:00
Brian Goff 6b571eeb83 Fix race/deadlock in v1 plugin handlers 
When a plugin is activated, and then `plugins.Handle` is called to
register a new handler for a given plugin type, a deadlock occurs when
for anything which calls `waitActive`, including `Get`, and `GetAll`.

This happens because `Handle()` is setting `activated` to `false` to
ensure that plugin handlers are run on next activation.
Maybe these handlers should be called immediately for any plugins which
are already registered... but to preserve the existing behavior while
fixing the deadlock, track if handlers have been run on plugins and
reset when a new handler is registered.

The simplest way to reproduce the deadlock with Docker is to add a `-v
/foo` to the test container created for the external graphdriver tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2938dce794be7559ba73b4e9630015020a7fa937
Component: engine
 2016-12-27 12:27:41 -05:00
Alexander Morozov 205f5cbe76 Merge pull request #29694 from lixiaobing10051267/masterFileNodify2 
It is errNoSuchWatch not errNoSuchPoller in filenotify/poller.go
Upstream-commit: e3f61bd254071fc410fbd343bb103ab4ffef040c
Component: engine
 2016-12-27 09:04:34 -08:00
allencloud 0cddfcad2f fix nits in comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6fb05778ba241b344dd9014ff1091e3f70a8b40c
Component: engine
 2016-12-27 23:30:50 +08:00
Vincent Demeester e7707954e8 Merge pull request #29725 from yuexiao-wang/remove-redundant-var 
Remove unused variable
Upstream-commit: 592f9891d4349b9f314320c9c5bde0b4d3959664
Component: engine
 2016-12-27 16:05:43 +01:00
yuexiao-wang 96e0490c24 Remove unused variable 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 08c6575cafd549a9d6688fab218377d73889ba72
Component: engine
 2016-12-28 03:20:41 +08:00
Justin Cormack 55c61b86bd Merge pull request #29720 from lixiaobing10051267/masterArmClone 
use https clone url for docker/docker in ARM.md
Upstream-commit: 9f60ae538bd96f5387a7433ea2f562e1e299d299
Component: engine
 2016-12-27 14:05:15 +00:00
Ke Li 7c2700ecf9 Remove redundant format 
Signed-off-by: Ke Li <kel@splunk.com>

Add missing changes

Signed-off-by: Ke Li <kel@splunk.com>

User errors.New to create error

Signed-off-by: Ke Li <kel@splunk.com>
Upstream-commit: 514adcf4580effa4820be8d5e6d2c0ea9825ceb2
Component: engine
 2016-12-27 21:46:52 +08:00
Sebastiaan van Stijn 5f505e7636 Merge pull request #28692 from allencloud/splict-function-out-of-command-denifition-scope 
refactor code to split function out of command definition scope
Upstream-commit: 7a339eb4e906e0dabccb94f1629e8899e283edfe
Component: engine
 2016-12-27 13:48:12 +01:00
Vincent Demeester 4579c9a13e Merge pull request #29714 from vdemeester/small-requirement-fix 
Display only the name of the requirement…
Upstream-commit: e7d4269a5048d4e472aabaeee309b2d786c24a11
Component: engine
 2016-12-27 13:21:43 +01:00
Sebastiaan van Stijn 2e85044fb0 Merge pull request #29712 from allencloud/add-network-name-when-disconnecting-error 
display network name when disconnecting network error
Upstream-commit: 16500dfb1d1c0a3fc0d363ae782c22e8eda3b720
Component: engine
 2016-12-27 13:08:07 +01:00
Sebastiaan van Stijn 1ba9a6e736 Merge pull request #29709 from allencloud/fix-29708-more-correct-error-message 
return more accurate error message when docker kill
Upstream-commit: 3702ee13bcb61ca72e63b2d177e756fd8ad1042f
Component: engine
 2016-12-27 13:06:44 +01:00
Sebastiaan van Stijn 6ae133987d Merge pull request #29703 from allencloud/make-pkg-system-support-darwin 
make more package in system support darwin
Upstream-commit: 398ac2a884a42d6ba0a40260f47b2f18dfa422ac
Component: engine
 2016-12-27 13:01:13 +01:00
lixiaobing10051267 9c5810cac4 use https clone url for docker/docker in ARM.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: cddd28817001bc07104bf7f3481b6e74fd43caa9
Component: engine
 2016-12-27 19:51:45 +08:00
Sebastiaan van Stijn c7bd985ccb Merge pull request #29707 from gesellix/delete-plugin-swagger 
fix swagger description for `DELETE /plugin/{name}`
Upstream-commit: 55d5c80214481299a1627a3bb2e32c4c1e358700
Component: engine
 2016-12-27 12:24:51 +01:00
Sebastiaan van Stijn 44db4994e4 Merge pull request #29648 from yuexiao-wang/fix-man-docker 
Update the manuals of docker and dockerd
Upstream-commit: e3000a4e2f24a061d54cf135196a72c8d767a9a0
Component: engine
 2016-12-27 12:13:20 +01:00
Vincent Demeester 5d4d6d04ad Merge pull request #29699 from yuexiao-wang/update-index 
Update the index of docker command line
Upstream-commit: af843c53f88c14fc494553a42ef45fb7937f13dc
Component: engine
 2016-12-27 11:26:50 +01:00
yuexiao-wang a8c2e6aae2 Update the index of docker command line 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: f649f54c60aee1a88c40b5c8c635c381f324b5a7
Component: engine
 2016-12-28 02:39:04 +08:00
yuexiao-wang 8a1df96ade Update docker daemon to dockerd 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 62cc802f6160b7fbb506f5307d96a564cbfb5f1f
Component: engine
 2016-12-27 17:32:15 +08:00
Vincent Demeester d3fb58de2f Merge pull request #29705 from allencloud/rename-clusterProvider-to-cluster 
rename clusterProvider to cluster in router
Upstream-commit: 1474bf6c6e830e3300ac37fb630d1a0d8841d4bf
Component: engine
 2016-12-27 09:34:17 +01:00
allencloud b718dea1c9 return more accurate error message when docker kill 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cf5734b2e16978b7ae224de566a7c21020c88a78
Component: engine
 2016-12-27 13:38:13 +08:00
allencloud a7d9e53a66 display network name when disconnecting network error 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f0844de8f00eef8fe42503986a87933516b11b46
Component: engine
 2016-12-27 13:37:54 +08:00