docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
21,804 Commits 12 Branches 296 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

2718 Commits

Author SHA1 Message Date
Lei Jitang
ef9b8937c0 Fix docker daemon restart with paused container. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9a9724ad5616dc1a29efabe8082bde043c1a2bc9
Component: engine
 2015-08-25 09:42:58 +08:00
Stephen J Day
78b5767538 Avoid buffering to tempfile when pushing with V2 
The practice of buffering to a tempfile during a pushing contributes massively
to slow V2 push performance perception. The protocol was actually designed to
avoid precalculation, supporting cut-through data push. This means we can
assemble the layer, calculate its digest and push to the remote endpoint, all
at the same time.

This should increase performance massively on systems with slow disks or IO
bottlenecks.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 349aef06d51a9425f70a877585fe45283366c2c4
Component: engine
 2015-08-24 18:08:05 -07:00
Jessie Frazelle
322a07231d Merge pull request #12159 from mrunalp/feature/ipc_share_dev 
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
Upstream-commit: 903cd2b9e3e2cea8b5ee7c0b74d52ff4a3beafb5
Component: engine
 2015-08-24 17:55:03 -07:00
Alexander Morozov
a5560b01cb Merge pull request #15766 from hqhq/hq_fix_device 
Add mode check for device
Upstream-commit: 6b21e98432ef3c4c9b7da42cdb94749b9181b654
Component: engine
 2015-08-24 10:58:49 -07:00
Brian Goff
83ec490c79 Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy 
Add always-unless-stopped restart policy
Upstream-commit: fd8b25c802780683cc5776e6d3aaca9536e7370b
Component: engine
 2015-08-24 13:48:56 -04:00
Brian Goff
3170babd78 Merge pull request #12918 from thieman/tnt-issue-12595 
Use image ID in ps if tag has been updated
Upstream-commit: e14eaba784c3c78a964c5e50e8fa113d3321bbf8
Component: engine
 2015-08-24 12:24:42 -04:00
Brian Goff
d98907dbfe Merge pull request #15444 from coolljt0725/add_test_require_for_test_blkio 
Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
Upstream-commit: 2b174d3d9d6f6308a8092c93ff74461f2a946fee
Component: engine
 2015-08-24 08:33:17 -04:00
Brian Goff
1338c02038 Merge pull request #15779 from mountkin/split-build-test 
split build API tests to a separate file
Upstream-commit: 1ee53d4fb724c78a44c66d572db63608ba7733f8
Component: engine
 2015-08-24 08:31:48 -04:00
Qiang Huang
fdb06e387e Add mode check for device 
This fixes two problems:
1. docker run --device /dev/sda:rw ubuntu bash doesn't work
2. --device /dev/zero:/dev/noro:ro doesn't show clear error message,
but fail when writing to cgroup file.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 429423624c61b38efeaeda95792077a0da65c4ef
Component: engine
 2015-08-24 17:57:12 +08:00
David Calavera
7143030753 Merge pull request #15571 from ewindisch/apparmor_denywproc 
AppArmor: Deny w to /proc/* files
Upstream-commit: 9bac520c129c9fd5c9415b5170a66567d85247b4
Component: engine
 2015-08-24 11:03:41 +02:00
Lei Jitang
bfcda62bd6 Add some missing cgroup test require and refactor the require check. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c340ca4f5db9ab526532f26718a140654ff45458
Component: engine
 2015-08-24 11:37:11 +08:00
Travis Thieman
dd5279c777 Use image ID if tag has been updated 
Fixes #12595

Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
Upstream-commit: 2167f40a766d1909443695d96bcecc3d039fb482
Component: engine
 2015-08-23 12:11:24 -04:00
Shijiang Wei
2633e7b138 split build API tests to a separate file 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 96e37f671abd86f0a38403d2184e73ac6e56afd0
Component: engine
 2015-08-23 23:59:15 +08:00
Vincent Demeester
ae7a8a8203 Fix filter by label for docker images 
Using Config.Labels to filter images on Labels.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c71a99af11c1ae5442b7787368fd27ac2799ef99
Component: engine
 2015-08-22 14:06:48 +02:00
Brian Goff
e2e0f70ccb Merge pull request #15412 from vdemeester/dont-sleep-too-much 
time.Sleep in integration tests — comment and waitRun/waitInspect
Upstream-commit: 5929502b4e05ed82e78347169f3ba705cac8ad35
Component: engine
 2015-08-21 20:43:55 -04:00
Jessie Frazelle
a372501fd6 Merge pull request #15750 from mountkin/fix-exec-panic 
fix a panic when the exec fails to start
Upstream-commit: fefc9a3a6ae9ccb738a4e984ff90db70bb053484
Component: engine
 2015-08-21 15:54:58 -07:00
Jessie Frazelle
26bf545a48 Merge pull request #14006 from hqhq/hq_add_kmem_limit 
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
 2015-08-21 14:34:27 -07:00
Jessie Frazelle
20b08ad6cb Merge pull request #15507 from clintonskitson/patch_issue_15467 
added check for bind on create to determine local volume driver
Upstream-commit: 19f7bfcda9ea11806a39a6508d3961649ba8ba5d
Component: engine
 2015-08-21 14:23:44 -07:00
Shijiang Wei
589fca3f48 fix a panic when the exec fails to start 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: fcf9daad91d9be24ceddbc4add4d3a8179c9b32c
Component: engine
 2015-08-22 00:01:44 +08:00
Clinton Kitson
e87c28da2c added check for bind on create to determine local volume driver 
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
Upstream-commit: 6b8129d1fe9b1428833e1c38e463a5a4cc204390
Component: engine
 2015-08-20 01:40:04 -07:00
Mrunal Patel
83fa43c4c9 Modify test to include /dev/shm sharing 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 457aeaa2e1bdbb75c5b3bcedacde460920965c2f
Component: engine
 2015-08-19 12:36:57 -04:00
Doug Davis
06cb17df38 Merge pull request #15664 from skatsuta/fix-parse-null 
builder: avoid parsing null- string to nil slice (issue #15634)
Upstream-commit: ca795765859b8560ab3d1a0ff31338d84b3c69a5
Component: engine
 2015-08-19 09:06:20 -07:00
Qiang Huang
3004521c7f Add support for kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
 2015-08-19 23:56:55 +08:00
Doug Davis
3610e48336 Merge pull request #15691 from skatsuta/fix-printf-wrong-type 
integration-cli: fix printf verbs of wrong types
Upstream-commit: 09cdd0524efe4804c8e5b772af87afbbb8c73cb8
Component: engine
 2015-08-19 08:12:45 -07:00
Sebastiaan van Stijn
68987b8336 Merge pull request #12927 from lindenlab/custom-host-port-ranges 
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
Upstream-commit: 59e49e1db0c4b59d8ca7334fdadade73755969b9
Component: engine
 2015-08-19 17:04:23 +02:00
Soshi Katsuta
e87b5d1d77 integration-cli: fix printf verbs of wrong types 
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: 5759b95e7e7c269af48a095773961ed8d13f8798
Component: engine
 2015-08-19 17:47:33 +09:00
Soshi Katsuta
b5be5aca06 integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil 
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: a41f431d118291c47344b6f2599f0a8c5b272f5a
Component: engine
 2015-08-19 15:23:11 +09:00
Soshi Katsuta
8e9c7e7df9 integration-cli: modify %s to %d in formatting an int 
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: 5b870d7fa6d65895a4be601a1e09812a4962d03d
Component: engine
 2015-08-19 12:06:05 +09:00
Soshi Katsuta
a9c24d4837 integration-cli: add a integration test to avoid parsing null string in ADD, COPY and VOLUME to nil slice 
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
Upstream-commit: d45fcc6c80bd67ee6a06821fd64cad029d3a756f
Component: engine
 2015-08-19 11:11:46 +09:00
Tonis Tiigi
2bf42179ec Add unless-stopped restart policy 
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 10305dc5e8cc7e2e1560ce2abe93c17e923a1c47
Component: engine
 2015-08-18 11:39:06 -07:00
Vincent Demeester
22da8315f6 Remove/Comment time.Sleep in integration tests 
Remove what seems unnecessary time.Sleep (1 second even) and comment the
ones that seemed necessary.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 799d9605d6d37a0f5c559b0325d924ad183ff4ee
Component: engine
 2015-08-18 20:36:08 +02:00
David Calavera
57a4ccd575 Merge pull request #15649 from LK4D4/syslog_validation 
Syslog validation
Upstream-commit: 8aa520b8c020dd78055fbf4423ca0c086f3e4bf4
Component: engine
 2015-08-18 11:14:31 -07:00
Tonis Tiigi
2a748ae2e6 Fix pull on client disconnect 
Fixes #15589

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8eeafa058c762b303436422a4682c364fe469985
Component: engine
 2015-08-18 09:41:37 -07:00
Zhang Kun
a3521c2e7e fix in daemon side 
Signed-off-by: Zhang Kun <zkazure@gmail.com>

goformat

Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix small

Signed-off-by: Zhang Kun <zkazure@gmail.com>

change to rm

Signed-off-by: Zhang Kun <zkazure@gmail.com>

handler other error

Signed-off-by: Zhang Kun <zkazure@gmail.com>

unique ERR

Signed-off-by: Zhang Kun <zkazure@gmail.com>

setHostConfig_fail_test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

format

Signed-off-by: Zhang Kun <zkazure@gmail.com>

err handle and modify test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

golint error

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 1ed15550f57ae822bb30263ce81174cabeb794ec
Component: engine
 2015-08-18 10:06:36 +08:00
Doug Davis
f00550c0b6 Merge pull request #15599 from calavera/ps_format_q 
Fix ignore `-q` flag in `docker ps` when there is a default format.
Upstream-commit: 29ced5d0c4d67b3609c95bc039589009086852b3
Component: engine
 2015-08-17 15:44:28 -07:00
Alexander Morozov
8deea878c7 Fix LogConfig.Config in inspect 
Also add test for daemon-wide log-opt.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f61002b05794eb5e4262a39e29f8a45c7260ba3
Component: engine
 2015-08-17 15:27:44 -07:00
Alexander Morozov
03328caba1 Check syslog config on daemon start 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
 2015-08-17 14:29:45 -07:00
Brian Goff
5bfc44e34c Merge pull request #15292 from mountkin/fix-exec-test 
move the assertions outside of the goroutine
Upstream-commit: 5c88a6fdcaa264845e5ad07f57222f750e213520
Component: engine
 2015-08-17 17:24:58 -04:00
David Calavera
4c6bab5f50 Fix ignore -q flag in docker ps when there is a default format. 
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: df46bfdd4d28dcab432b2fc6c36131ff95223148
Component: engine
 2015-08-17 10:48:04 -07:00
Brian Goff
f403372672 Fix inspect output when no log driver specified 
Config options were being ignored in the inspect output when no driver
was specified.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
 2015-08-17 11:35:34 -04:00
Sebastiaan van Stijn
f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged 
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
 2015-08-16 00:20:41 +02:00
Arnaud Porterie
28513048f1 Merge pull request #15598 from cpuguy83/15570_fix_exec_tty 
Fix issue with exec TTY caused by 15446
Upstream-commit: bd9cc788d0245fe1fcd3370dd8a55eb94f781665
Component: engine
 2015-08-14 19:43:04 -07:00
Don Kjer
470c87b117 Adding support to publish on custom host port ranges 
Signed-off-by: Don Kjer <don.kjer@gmail.com>

Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
Upstream-commit: 47272f9cc563ea90d1f86df044f5429d15a37e4f
Component: engine
 2015-08-15 02:41:29 +00:00
Brian Goff
57a36297f7 Fix issue with exec TTY caused by 15446 
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5ffcecf130aea8c0b92d1be728e2c302cf2c6c70
Component: engine
 2015-08-14 14:55:26 -07:00
Tibor Vass
809e0fd73f Merge pull request #14530 from Microsoft/10662-serversidevalidation 
Windows: [TP3] Move netmode validation to server
Upstream-commit: 3e523ae015750be4893b9c5a4f77361fbb0e9849
Component: engine
 2015-08-14 16:05:59 -04:00
John Howard
da7258ee55 Move netmode validation to server 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f6ed590596cbf73764b40ff4f32f90b1cdb8b213
Component: engine
 2015-08-14 12:17:41 -07:00
Eric Windisch
9aef8f471d AppArmor: Deny w to /proc/* files 
Introduce a write denial for files at the root of /proc.

This prohibits root users from performing a chmod of those
files. The rules for denials in proc are also cleaned up,
making the rules better match their targets.

Locally tested on:
- Ubuntu precise (12.04) with AppArmor 2.7
- Ubuntu trusty (14.04) with AppArmor 2.8.95

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 7342d59114fe443ae8d59474abb59280f014c493
Component: engine
 2015-08-13 15:39:25 -04:00
Sebastiaan van Stijn
f1cc5568e9 Merge pull request #13501 from vdemeester/8048-image-repository-tag 
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
 2015-08-13 21:36:21 +02:00
Vincent Demeester
d024131050 Fix #8048 : make docker images repository:tag work 
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.

Closes #8048.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
 2015-08-13 08:50:09 +02:00
Tim Dettrick
273be038ad Updated test to check for exec --privileged side-effects 
Also improving documentation for same feature as part of
docker/docker#14113 docs review.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 90326939c8089dbd7b59423415bc67cae6208b08
Component: engine
 2015-08-13 16:37:20 +10:00