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
29,874 Commits 12 Branches 297 Tags
1ab863db0a11d64b09ea2f913cf238115fc4c4a9
Commit Graph

2219 Commits

Author SHA1 Message Date
lixiaobing10051267
0fd4d2ba16 Use wrong ApplyLayer in diff_windows.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 9501f2ea978bf13d2f050f31223b15fad5b26622
Component: engine
 2016-12-19 17:21:18 +08:00
Aaron Lehmann
035a86c3f5 Merge pull request #29439 from lixiaobing10051267/masterWalk 
rectify function and variable referred in pkg/archive/changes_linux.go
Upstream-commit: 545b97e6bc0f7e1be4e7f54604389d7584dc9658
Component: engine
 2016-12-16 17:25:09 -08:00
Daniel Nephin
c9e434865c Move pkg to cli/compose/convert 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 643fd775edb0a05d649f4d484e966428eb3a6b09
Component: engine
 2016-12-16 12:27:31 -05:00
Daniel Nephin
8d30926318 More unit tests for converting services in stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4664dd06f1184d11c62de8a4e5e6653ed26c3790
Component: engine
 2016-12-16 12:20:07 -05:00
Daniel Nephin
930d936818 Move ConvertService to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 655e48e65309f0191bbbb8b2e9730b6976e148cd
Component: engine
 2016-12-16 12:20:07 -05:00
Daniel Nephin
cb4b458233 Move ConvertVolumes to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7685e80fc9cb79206d81757eee071f0244323600
Component: engine
 2016-12-16 11:51:13 -05:00
Daniel Nephin
20aacdd131 Move ConvertNetworks to composetransform package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6b778c96336fe9c0bcfea477092aab8cdfc0c896
Component: engine
 2016-12-16 11:51:13 -05:00
lixiaobing10051267
ec888ed9cd rectify function and variable referred in pkg/archive/changes_linux.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: e5ada578c3b0b554b5d996127ac6f5803cdb9431
Component: engine
 2016-12-16 14:58:47 +08:00
Phil Estes
e09abd9511 Merge pull request #29366 from unclejack/pkg_return_directly 
pkg: return directly without ifs where possible
Upstream-commit: 8415aeb39ae45e4414785f76ee63438ffc9517eb
Component: engine
 2016-12-14 21:20:26 +01:00
Tibor Vass
f541c344f4 Merge pull request #29008 from cpuguy83/refcount_graphdriver 
Refcount graphdriver plugins properly
Upstream-commit: af50cefe6cdf07e2028b9ad934a2cb5818a935eb
Component: engine
 2016-12-13 19:24:46 -08:00
unclejack
f9eb0e420f pkg: return directly without ifs where possible 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 418e6123834def872edef06972c16d97b4cbc542
Component: engine
 2016-12-13 22:10:11 +02:00
Xianglin Gao
d0d8fac761 Get rid of err altogether by just returning the assignment 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
Upstream-commit: da5d3cccc43a9ee51c8b37c751cfbc2a4e16e9ee
Component: engine
 2016-12-13 14:25:57 +08:00
Vincent Demeester
e451072298 Merge pull request #29287 from Microsoft/jjh/fixd4w301 
Windows: Fix crash in docker system prune
Upstream-commit: a1307aab28289cb8c05fd94011b269966a1ad742
Component: engine
 2016-12-12 10:30:13 +01:00
Brian Goff
6dcc37964b Refcount graphdriver plugins properly 
Adds 2 new methods to v2 plugin `Acquire` and `Release` which allow
refcounting directly at the plugin level instead of just the store.
Since a graphdriver is initialized exactly once, and is really managed
by a separate object, it didn't really seem right to call
`getter.Get()` to refcount graphdriver plugins.
On shutdown it was particularly weird where we'd either need to keep a
driver reference in daemon, or keep a reference to the pluggin getter in
the layer store, and even then still store extra details on if the
graphdriver is a plugin or not.

Instead the plugin proxy itself will handle calling the neccessary
refcounting methods directly on the plugin object.

Also adds a new interface in `plugingetter` to account for these new
functions which are not going to be implemented by v1 plugins.

Changes terms `plugingetter.CREATE` and `plugingetter.REMOVE` to
`ACQUIRE` and `RELEASE` respectively, which seems to be better
adjectives for what we're doing.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f29bbd16f5d2bb82d815ea59f8ef85fe59384c89
Component: engine
 2016-12-09 19:46:28 -05:00
John Howard
4c8ed1c0c8 Windows: Fix crash in docker system prune 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e5900ee9bf0071c6a3ebaf813f82d5345c25d8f0
Component: engine
 2016-12-09 14:23:25 -08:00
Vincent Demeester
71651385ac Extract daemon to its own package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 48de91a33f097d4c20515088af1f5bcb9a98c5c9
Component: engine
 2016-12-09 22:26:42 +01:00
Anusha Ragunathan
6b1a2692bb Merge pull request #26398 from tiborvass/plugin-fixes 
plugins: container-rootfs-relative paths
Upstream-commit: 0a072e93df6ad10e37bbf0b1f540fff7b7581a75
Component: engine
 2016-12-09 12:48:59 -08:00
Tibor Vass
656f60dc73 plugins: container-rootfs-relative paths 
Legacy plugins expect host-relative paths (such as for Volume.Mount).
However, a containerized plugin cannot respond with a host-relative
path. Therefore, this commit modifies new volume plugins' paths in Mount
and List to prepend the container's rootfs path.

This introduces a new PropagatedMount field in the Plugin Config.
When it is set for volume plugins, RootfsPropagation is set to rshared
and the path specified by PropagatedMount is bind-mounted with rshared
prior to launching the container. This is so that the daemon code can
access the paths returned by the plugin from the host mount namespace.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c54b717caf1a55e525ce180bfcb42addd59c6633
Component: engine
 2016-12-09 10:16:24 -08:00
Akihiro Suda
d377a823f5 Merge pull request #29244 from yuexiao-wang/fix-typos-eg 
Fix a bit typos
Upstream-commit: d1515a5264e7872bfe11543b2b23b4f1eac23f68
Component: engine
 2016-12-09 16:03:35 +09:00
yuexiao-wang
795fc21c8b Fix a bit typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 11454e1c97ed5495e77a06868a0c199d81aa96c3
Component: engine
 2016-12-09 03:05:11 +08:00
Justin Cormack
41c08096ed Merge pull request #28924 from xlgao-zju/fix-apparmor-load-profile 
fix apparmor load profile
Upstream-commit: 68a423304ec0a9ee590ced5ebbdb27f359cee365
Component: engine
 2016-12-08 08:47:27 -08:00
Akihiro Suda
7eb856b2dd Merge pull request #28939 from duglin/HideDupWarnings 
Only show global warnings once
Upstream-commit: e8a2c7196a2715c318bbfb2b57076fa1922a245f
Component: engine
 2016-12-06 16:12:34 +09:00
Alexander Morozov
161d115fd3 Merge pull request #29043 from duglin/Issue29014 
Fix use of **/ in .dockerignore
Upstream-commit: 8895ee0b4d22fb48b496f3f0a0589c2b6c8031a6
Component: engine
 2016-12-02 08:34:45 -08:00
Doug Davis
330477b5f0 Fix use of **/ in .dockerignore 
.dockerignore pattern of **/.foo incorrectly matched **/bar.foo
because **/.foo was getting converted into a .*\.foo regex
instead of (.*/)*\.foo

Closes #29014

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 376bb84c5c8f6183dbb88dae705e1de4182da4c9
Component: engine
 2016-12-02 03:58:54 -08:00
Justin Cormack
abe19725d9 Merge pull request #28996 from Microsoft/jjh/sqlite-remove-windows 
Windows: Factor out sqlite
Upstream-commit: a756c1ac659468bb8d6ec9ee2e1182fc6cae4002
Component: engine
 2016-12-01 13:56:11 -08:00
John Howard
c3ca8eccc1 Windows: Factor out sqlite 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3f6127b173949cb36557601a56bc15ae2c45a698
Component: engine
 2016-12-01 09:38:08 -08:00
Alexander Morozov
ed1107ee39 Merge pull request #28784 from thaJeztah/add-some-adjectives 
Add some adjectives to the namesgenerator
Upstream-commit: 0bf4510a53f09bc55942e5d894f8a1b78b6ac055
Component: engine
 2016-11-30 11:46:56 -08:00
Vincent Demeester
ba962e129a Merge pull request #28487 from cpuguy83/stack_dumps 
Move stack dump dir to exec root
Upstream-commit: 6367c67ab71916d677d3498f0bb536da9ae63597
Component: engine
 2016-11-30 20:01:29 +01:00
Doug Davis
3077005306 Only show global warnings once 
Upon each container create I'm seeing these warning **every** time in the
daemon output:
```
WARN[0002] Your kernel does not support swap memory limit
WARN[0002] Your kernel does not support cgroup rt period
WARN[0002] Your kernel does not support cgroup rt runtime
```
Showing them for each container.create() fills up the logs and encourages
people to ignore the output being generated - which means its less likely
they'll see real issues when they happen.  In short, I don't think we
need to show these warnings more than once, so let's only show these
warnings at daemon start-up time.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ff42a2eb41a86217a440a1c4b2afd3c4cd1d48ac
Component: engine
 2016-11-30 10:11:42 -08:00
Xianglin Gao
911f8f8001 fix apparmor load profile 
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
Upstream-commit: 2ab8f2e389b4ae90d0cec6555ea5708ceca1cc3c
Component: engine
 2016-11-29 15:48:38 +08:00
Sebastiaan van Stijn
dc8295e701 Add some adjectives to the namesgenerator 
Because .. `hardcore_hamilton` and `inspiring_murdock`

https://twitter.com/swiftonsecurity/status/801195049165799424

Also replacing adjectives that could be interpreted as
refering to body size, (mental) health, intoxication.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 169b4d92a15a08683e3f3afe7f278d9a0199153a
Component: engine
 2016-11-24 18:38:04 +01:00
Tõnis Tiigi
167591374d Merge pull request #28683 from darrenstahlmsft/SystemDLL 
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
Upstream-commit: 5c1826ec4de381df9f739ce0de28e37d4f734d47
Component: engine
 2016-11-22 16:58:30 -08:00
Darren Stahl
4d1ac89cc0 Swap usage of LazyDLL and LoadDLL to LazySystemDLL. 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 22c83c567f379dfd475ecd35665e1cc9e5b9c314
Component: engine
 2016-11-22 14:57:11 -08:00
Sebastiaan van Stijn
dc5227ef8f Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
 2016-11-22 22:47:38 +01:00
Sebastiaan van Stijn
4c1ce8ff4b Merge pull request #28698 from YuPengZTE/devErrot 
error strings should not be capitalized or end with punctuation
Upstream-commit: 86eae4018a06c0291f9572cd7f062f320b612698
Component: engine
 2016-11-22 21:25:09 +01:00
Tibor Vass
419cdb27d7 Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 677e14643c79184ca9d8123dd3e91e0444b1cac3
Component: engine
 2016-11-22 10:17:10 -08:00
Ben Firshman
e5912f7d7e Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
 2016-11-22 12:49:38 +00:00
yupeng
28a6abec82 error strings should not be capitalized or end with punctuation 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: fc11efa2dbf72bb493a24650860220a2d4b07c5e
Component: engine
 2016-11-22 14:53:11 +08:00
yupeng
163c2e9b09 First header should be a top level header 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 1e65db4206ba89af24400fbf9047b25ec98cfd02
Component: engine
 2016-11-22 09:33:21 +08:00
Anusha Ragunathan
c21adc5da9 Add HTTP client timeout. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 83ca993c154d56e03d6f95a3f8351c48b3ed3e29
Component: engine
 2016-11-21 13:11:40 -08:00
Doug Davis
40d5a75060 Merge pull request #28611 from vieux/fix_golint 
fix a few golint errors
Upstream-commit: 96f50e9b7087bad25cb38e2985c26b509be0c403
Component: engine
 2016-11-19 07:16:44 -05:00
Victor Vieux
c148947fe6 fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
 2016-11-18 18:32:02 -08:00
Victor Vieux
6038277781 skip api/types/container/ (like golint) and fix one pkg 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 79a891efb7365e4f7d129a0142e66d2852781608
Component: engine
 2016-11-18 16:33:50 -08:00
allencloud
5d1129c013 fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1f039a66ac55c937f5dfa281a04009626d191f83
Component: engine
 2016-11-18 15:51:36 +08:00
Tom Wilkie
169609485f s/bCap/bLen/ 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Upstream-commit: 3a0554585177a55802377423bb4529d305b4566f
Component: engine
 2016-11-17 21:05:09 +00:00
Tom Wilkie
6ad95c4c59 Fix use of cap in MultiReadSeeker 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Upstream-commit: 158bb9bbd588aa03a3567f40b367025ccbd81fb3
Component: engine
 2016-11-17 18:36:35 +00:00
Brian Goff
594f65145f Move stack dump dir to exec root 
Dump stack dumps to exec root instead of daemon root.
When no path is provided to the stack dumper, such is the case with
SIGQUIT, dump to stderr.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0bd720b28dc7b416fe2193bdafaca011ec24d032
Component: engine
 2016-11-16 12:55:18 -05:00
John Howard
593e5eb2d5 Windows: Use sequential file access 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7c29f5beed19b55ac8f14880752d4825ba23eccf
Component: engine
 2016-11-14 17:41:52 -08:00
Vincent Demeester
1972d4f850 Merge pull request #28365 from wefine/fix-t-errorf 
fix t.Errorf to t.Error in serveral _test.go
Upstream-commit: 21051de6e1ba928a08baff505a7d89532b6133eb
Component: engine
 2016-11-14 14:46:30 +01:00
wefine
7a9630020f fix t.Errorf to t.Error in serveral _test.go 
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
Upstream-commit: f78f7de96aebee64b55bb9955fa6c97be2c59662
Component: engine
 2016-11-14 17:54:43 +08:00