toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,128 Commits 3 Branches 295 Tags
8b3646ee7588ecfed0253f7ed4acde01b287c351
Commit Graph
30128 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhu Venugopal f64e4c361c Properly cleanup plugin states which might impact other tests 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0510afc88304a465b2d2eacc6c479c572cb0c1cb
Component: engine
 2016-12-30 12:28:22 -08:00
Madhu Venugopal bc659af9d7 Handle Plugin reference count during network create and delete 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: fc2c0e623d3c7fd7f3d7e9632a765adbcc893108
Component: engine
 2016-12-30 12:28:22 -08:00
Madhu Venugopal 68566df78e Vendoring libnetwork to bring in isbuiltin changes 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: d2079a7789f26edc667b9102c25798fdb2c6d3ed
Component: engine
 2016-12-30 12:26:40 -08:00
Vincent Demeester 2758f0996d Remove pkg/integration and move it to testutil or integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 33968e6c7df164fff0a882c50ae7f4f7e6190e4b
Component: engine
 2016-12-30 18:26:34 +01:00
Vincent Demeester 0a5cee537e Merge pull request #29774 from miaoyq/complete-plugin-create-docs-content 
Complete the document content
Upstream-commit: 5374d53322abd6a5b2ebb34b7422abc26d1b5eb3
Component: engine
 2016-12-30 11:15:16 +01:00
majiuyue 00385406 31c2689d03 test: Fix "--raw-logs=true" option test in TestDaemonStartWithoutColors 
Because "tty" is closed in s.d.Stop() for "--raw-logs=false" test,
we need to open another pair of pty before test "--raw-logs=true"
option.

This patch fix #29772.

Signed-off-by: Jiuyue Ma <majiuyue@huawei.com>
Upstream-commit: c9e0d923ae6d2b5558378183b79d0a85ccf16020
Component: engine
 2016-12-30 17:26:01 +08:00
Yanqiang Miao aa956c7c5f Optimization a error description 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 6c021893aa12088c0ad5b18111cfa80d6008a78f
Component: engine
 2016-12-30 11:58:39 +08:00
Yanqiang Miao 1b2be89310 Complete the document content 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 1ebb68053e17f9b88f1265390acdce20214f2afc
Component: engine
 2016-12-30 08:47:08 +08:00
Sebastiaan van Stijn d18def1e2d Merge pull request #28852 from miaoyq/rename-log-context 
Rename 'context' to 'loginfo' in the logger module
Upstream-commit: a33105626870bfcbca97052b25b114e005a145ac
Component: engine
 2016-12-30 01:13:49 +01:00
Sebastiaan van Stijn 6b3d2b6135 Merge pull request #28631 from likel/master 
Don't do format if it's unnecessary
Upstream-commit: d6be0e98027611cfb14a3246ca797bee0936e649
Component: engine
 2016-12-30 01:13:12 +01:00
Sebastiaan van Stijn a767ec924e Merge pull request #29721 from coolljt0725/follow_29365 
Follow up #29365, fix fail to remove container after restart
Upstream-commit: 36ed7d58bb19e46445c81b6a00a7b75a6280e654
Component: engine
 2016-12-30 00:13:13 +01:00
Tõnis Tiigi ce228c30e5 Merge pull request #29609 from dnephin/add-compose-file-package 
Replace the vendored aanand/compose-file with a local copy
Upstream-commit: edaa3c6f07385f0c08bc62811508c56d821e696f
Component: engine
 2016-12-29 15:12:59 -08:00
Tõnis Tiigi 7b188d600d Merge pull request #29624 from yongtang/29619-build-label-order 
Sort the labels passed from `build --labels`
Upstream-commit: aacc2c88803b4b908a4e565a1dd5f7fafa5e54f0
Component: engine
 2016-12-29 15:09:53 -08:00
Sebastiaan van Stijn 78bec80aa1 Merge pull request #29661 from vdemeester/integration-cli-test-environment 
[integration-test] Introduce an environment package
Upstream-commit: a247bf0e99cd782a3c4e87cf70b36bf84f8e780b
Component: engine
 2016-12-29 22:12:42 +01:00
Santhosh Manohar bcd39ee4b9 Update check-config.sh to include modules for FTP/TFTP 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: e475136208776f68840f987d751d45690378acf2
Component: engine
 2016-12-29 13:04:36 -08:00
Brian Goff 771c21fdd2 Merge pull request #29769 from duglin/FixWinTest 
Fix flaky windows TestRestartRunningContainer test
Upstream-commit: 11b11e1559565aba0e662c8548fd54ebd3a98476
Component: engine
 2016-12-29 15:48:43 -05:00
Sebastiaan van Stijn ce3330c6eb Merge pull request #29683 from vdemeester/runconfig-clean 
Clean some stuff from runconfig that are cli only…
Upstream-commit: 1dd941077653bc93ee4141c4d2bac90534678e3f
Component: engine
 2016-12-29 17:42:08 +01:00
Sebastiaan van Stijn b0d5cafbe4 Merge pull request #29770 from allencloud/fail-fast-when-filter-invlaid 
fail fast when network filter invalid
Upstream-commit: 156ee508343dc36d6bda7c9d6d3072a201e5ef73
Component: engine
 2016-12-29 17:38:08 +01:00
Doug Davis 6f964785d6 Fix flaky windows TestRestartRunningContainer test 
I was seeing this for windowsRS1 testing:
17:20:36 ----------------------------------------------------------------------
17:20:36 FAIL: docker_cli_restart_test.go:31: DockerSuite.TestRestartRunningContainer
17:20:36
17:20:36 docker_cli_restart_test.go:39:
17:20:36     c.Assert(out, checker.Equals, "foobar\n")
17:20:36 ... obtained string = ""
17:20:36 ... expected string = "foobar\n"
17:20:36
17:20:59
17:20:59 ----------------------------------------------------------------------

and I think its because there's a delay between the time the container is
started and the 'echo' is actually run. This gives it up to 10 seconds
to do the 'echo' before giving up.

/cc @jhowardmsft

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bae22d167cd29016541a6d4f93d38f2608d8e51f
Component: engine
 2016-12-29 08:13:43 -08:00
Vincent Demeester d5d31f8ddb Merge pull request #29517 from thaJeztah/update-criu 
Update criu to 2.9
Upstream-commit: 83cecf820a0abbe1fc5be1c70f03a61aa2a164ee
Component: engine
 2016-12-29 16:20:59 +01:00
Sebastiaan van Stijn b8997fee88 Merge pull request #29222 from yongtang/28789-plugin-inspect-follow-up 
Allow ID-based `docker plugin enable/disable/rm/set`
Upstream-commit: 00cdb97f0dea4d41fac8df4813888bb8b945f0d0
Component: engine
 2016-12-29 13:40:40 +01:00
Yanqiang Miao cabd6a6108 Rename 'context' to 'loginfo' in the logger module 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

gofmt

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

remove 'api/types/container/config.go' from this PR

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

change 'LogInfo' to 'Info'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 17ec911da7d4b77b069d9f6c8c010865e19acc6c
Component: engine
 2016-12-29 19:13:44 +08:00
Sebastiaan van Stijn 352f3bdb52 Merge pull request #29740 from lixiaobing10051267/masterGraph2 
update URL of plugins_graphdriver.md in experimental/README.md
Upstream-commit: d2b27c10a1eef7c74e3c470844c3670a2ddda1c2
Component: engine
 2016-12-29 11:34:19 +01:00
Sebastiaan van Stijn 95f6620a1f Merge pull request #29478 from AkihiroSuda/fix-gcplogs-29344 
gcplogs: forcibly set HOME on static UNIX binary
Upstream-commit: f635cf05ab65195616e85887302f0dec42ce5f16
Component: engine
 2016-12-29 11:27:23 +01:00
Vincent Demeester 0f363a44c6 Introduce a environment package in integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 433e2e8a1eb84ad7bb39b5206b2fdf6ac9da7b27
Component: engine
 2016-12-29 11:00:50 +01:00
allencloud 82cdad076c fail fast when network filter invalid 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ee2925e2f970a83581aadd08704b117b09377d23
Component: engine
 2016-12-29 17:34:53 +08:00
Vincent Demeester 7e8e39781a Merge pull request #29687 from thaJeztah/cleanup-cli-command-container 
Minor cleanups in cli/command/container
Upstream-commit: 4d5cba127b7fccdbc00cfca5fc31d7bf655d8c5e
Component: engine
 2016-12-29 09:31:46 +01:00
Sebastiaan van Stijn daae214603 Merge pull request #29762 from vdemeester/integration-mini-clean 
Small cleanup in `integration-cli/docker_utils.go` 👼
Upstream-commit: 79f1c9c81d43da1c5746552a0d05980ed5e6447c
Component: engine
 2016-12-29 09:29:53 +01:00
Sebastiaan van Stijn 5732c11db2 Merge pull request #29371 from vdemeester/clean-integration-utils 
[test-integration] Clean utils.go from most of its content
Upstream-commit: 021710fcdf61308657b8a25bbf23019535dcdd81
Component: engine
 2016-12-29 09:28:46 +01:00
Akihiro Suda e8ed8e5184 gcplogs: forcibly set HOME on static UNIX binary 
Fix #29344

If HOME is not set, the gcplogs logging driver will call os/user.Current() via oauth2/google.
However, in static binary, os/user.Current() leads to segfault due to a glibc issue that won't be fixed
in a short term. (golang/go#13470, https://sourceware.org/bugzilla/show_bug.cgi?id=19341)
So we forcibly set HOME so as to avoid call to os/user/Current().

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b86e3bee5aea8e72b7f08e104ebb5d6cb18f8890
Component: engine
 2016-12-29 03:17:26 +00:00
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