docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
15,476 Commits 12 Branches 296 Tags
b1b57c9cd41beebc3b2b84ae00a5d028eb0373b0
Commit Graph

269 Commits

Author SHA1 Message Date
Ma Shimiao
560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
Jessica Frazelle
7ea0137fad fix lxc because it doesnt have the hardened libcontainer stuff 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 52118df432353dee2a37dd284462c4c021174a50
Component: engine
 2015-05-07 17:40:37 -07:00
Jessie Frazelle
92cec4b2c1 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
 2015-05-07 17:13:32 -07:00
Jessie Frazelle
5c2686119c Merge pull request #11802 from hqhq/hq_add_blkio_weight 
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
 2015-05-07 17:10:39 -07:00
Jessie Frazelle
9fb1f7589d Merge pull request #12175 from dqminh/fix-allocate-port 
#12148: sort ports mapping before allocating
Upstream-commit: e03ac8d5b98f525c3d32bb5a6ac84b2c5717a0dc
Component: engine
 2015-05-07 17:04:20 -07:00
Jessica Frazelle
149aebf1ee bump version back to 1.7.0-dev 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 2c2f6fd2728067a5d3ab6ea393d8b5593de4bc0c
Component: engine
 2015-05-07 15:42:36 -07:00
Michael Crosby
ac6f208e83 Allow libcontainer to eval symlink destination 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add tests for mounting into /proc and /sys

These two locations should be prohibited from mounting volumes into
those destinations.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f25bbedc85e8a99c1389dbe8f48436907ce24526
Component: engine
 2015-05-07 14:43:39 -07:00
Michael Crosby
c87ab46f22 Mask reads from timer_stats and latency_stats 
These files in /proc should not be able to be read as well
as written to.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a7a51306b1459a67da3a9cbbe8c9f80d3950c084
Component: engine
 2015-05-07 14:42:23 -07:00
Michael Crosby
54739fa6d1 Mount RO for timer_stats and latency_stats in proc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 27ae108b4eda48a621afc5bf2157ef11c314a858
Component: engine
 2015-05-07 14:42:23 -07:00
Michael Crosby
50f626562d Prevent write access to /proc/asound 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	integration-cli/docker_cli_run_test.go
Upstream-commit: d87da59c79eabb794087f731d3ad51ea98f7a3cc
Component: engine
 2015-05-07 14:42:23 -07:00
Jessie Frazelle
2ee6387cbc Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
 2015-05-07 14:01:16 -07:00
Qiang Huang
4f3515319b add blkio.weight support 
We can use this to control block IO weight of a container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
 2015-05-07 11:55:58 +08:00
Lei Jitang
49e7e90010 Add support --net=container with --mac-address,--add-host error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e08e9aca14a4ca7142fa4649983302d93b55dab
Component: engine
 2015-05-05 19:28:40 +08:00
Arnaud Porterie
d7e8665b03 Add --userland-proxy daemon flag 
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f42348e18f73d1d775d77ac75bc96466aae56d7c
Component: engine
 2015-05-04 16:07:45 -07:00
mauriyouth
141582c6c7 Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 7d371c0b470334189720840854b2d5acbb1c7909
Component: engine
 2015-05-04 21:30:52 +02:00
Daniel, Dao Quang Minh
17d88307f9 sort ports mapping before allocating 
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: cd2b019214eb1978ae267786668dc7a8a3702679
Component: engine
 2015-04-30 02:18:04 +00:00
Antonio Murdaca
6982f607b4 c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 4203230cbbf46238e38099c9073bdcad5f69a63f
Component: engine
 2015-04-29 17:02:22 +02:00
David Mackey
ae74d9f34f trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
 2015-04-27 13:35:08 -07:00
Aidan Hobson Sayers
270e43ec62 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
 2015-04-27 14:57:37 +01:00
Alexander Morozov
c48fdf0abd Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a9688cdca5577d6db65d76f38bcbe4c1e6f5994f
Component: engine
 2015-04-24 10:37:21 -07:00
Alexander Morozov
1c64e12359 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
Upstream-commit: 799cf056e7f672f987b0b44adf0868ce56caab8b
Component: engine
 2015-04-23 13:07:40 -07:00
Srini Brahmaroutu
12be8c3158 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 231d362db73310a5243a72dcdb6df2df57c74488
Component: engine
 2015-04-23 18:25:18 +00:00
Antonio Murdaca
dd4b0467ca Remove deleteAllContainers call in test 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ee7a7b07e752c56bbe1b941feb1e4313275d68c2
Component: engine
 2015-04-23 16:32:50 +02:00
Alexander Morozov
1884ef3b9b Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
 2015-04-21 10:28:52 -07:00
Jessie Frazelle
cff18dc122 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
 2015-04-20 17:55:01 -07:00
Phil Estes
e0b5db7169 Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
Upstream-commit: 435643545c4b2c90e2a0a264527f6cc190d925cb
Component: engine
 2015-04-20 17:27:17 -04:00
Srini Brahmaroutu
97fb2745d9 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 1a35b16b08ef5a8b0764e5a383f36d5572f20dfe
Component: engine
 2015-04-20 17:57:53 +00:00
buddhamagnet
e52ab0e055 fix typo 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
Upstream-commit: cdd5d5e4c3fe241d178c09edb521ae91689b55df
Component: engine
 2015-04-20 18:56:21 +01:00
Lei Jitang
f8f4bcdb38 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dcc50e1d593fd7995189872791c6d7a013f16970
Component: engine
 2015-04-20 08:16:47 -07:00
Arnaud Porterie
ad529b2798 Merge pull request #12466 from robertabbott/fix_dockerCmd 
Removed unnecessary error output from dockerCmd
Upstream-commit: 5fd378c0d1d97601c7cfab6a62bb8da031a0001d
Component: engine
 2015-04-17 15:15:34 -07:00
bobby abbott
5e15f55a29 Removed unnecessary error output from dockerCmd 
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.

resolves #12355

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 621b601b3c602aab5ef0f07903fdf413881bb261
Component: engine
 2015-04-17 09:11:14 -07:00
Antonio Murdaca
6488f10044 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a0bf80fe0372196812a9cb295f209c08f8037601
Component: engine
 2015-04-17 14:27:38 +02:00
Qiang Huang
4f6ebaa34e add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8077b2fb805c78cee642d8350df88227c6414960
Component: engine
 2015-04-15 09:33:46 +08:00
Brian Goff
7d986b9758 Move TestRunWithTooLowMemory to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9b4d9a34218bcc506c7080a35c70788f46dc2e4e
Component: engine
 2015-04-13 16:40:48 -04:00
Alexander Morozov
5dd956e210 Get process list after PID 1 dead 
Fix #11087

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ac8bd12b39d39a9361adc174bdff7837e771460d
Component: engine
 2015-04-10 16:23:57 -07:00
Jessica Frazelle
0d1c1d0efa cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 255b84444a86201995d8f688d71b83822f146c3e
Component: engine
 2015-04-08 16:59:36 -07:00
Alexander Morozov
2f18e59567 Test case for network mode chain container -> container -> host 
Issue #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ce69dafe4d0424ddb5df53d9aee7728f0734cce7
Component: engine
 2015-04-07 15:20:42 -07:00
Brian Goff
ab9a366f0e Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
 2015-04-06 09:21:18 -04:00
Doug Davis
e8ab23fa21 Increase timeout on TestRunOOMExitCode test 
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8d1455d88b66011713da67098dc3464b897af9cd
Component: engine
 2015-03-31 16:57:43 -07:00
Jessie Frazelle
1541e9c937 Merge pull request #11934 from cpuguy83/fix_volume_symlink_check 
Fix volume symlink check
Upstream-commit: 749a117267c4c0f74b0162af9ed42c3307737dde
Component: engine
 2015-03-31 13:56:23 -07:00
Brian Goff
419d6ae6f9 Use getResourcePath instead 
Also cleans up tests to not shell out for file creation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 63708dca8a633d68f9342eebd4f7a616e8c48234
Component: engine
 2015-03-31 15:10:30 -04:00
Lei Jitang
3cecae722e Fix create volume in a directory which is a symbolic link 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7583b491250beac9caeeac13b7b68c4e0f03eb60
Component: engine
 2015-03-29 13:35:36 +08:00
Lei Jitang
0544f5e034 Fix error from daemon no such image even when the image exist 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
 2015-03-28 09:07:20 +08:00
Alexander Morozov
3495bd3522 Merge pull request #11848 from duglin/CleanupIntTests 
Clean up integration-cli tests
Upstream-commit: 240f3e14c78f34102672b121a43b612989856d0d
Component: engine
 2015-03-27 14:11:56 -07:00
Doug Davis
5897cb3c81 Clean up integration-cli tests 
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9a9d23dbc40c9b650bd1f9f98a421b7ff2312f36
Component: engine
 2015-03-26 17:25:50 -07:00
Peter Choi
0913f2905d Changed snake case naming to camelCase 
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
Upstream-commit: ae907e7af16136225417242ef5d55d3f6062fb3b
Component: engine
 2015-03-26 15:05:45 -06:00
Michael Crosby
0b6cf588fa Merge pull request #11791 from moo-mou/11768-vetwarning 
Fix vet warning
Upstream-commit: a196cc943ccb02a857c8509b6badb12e8e2071ac
Component: engine
 2015-03-26 10:52:07 -07:00
Jake Champlin
35acd2c3eb Add fixes for integration-cli tests w/ --net none 
Adds network to integration tests that were failing without network.

Fixes #10964
Fixes #10968

Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com>
Upstream-commit: c2fe26243906ad2641876e877d23a419bb4bdb75
Component: engine
 2015-03-25 23:46:04 -04:00
paul
8f2d65bf21 Fix vet warning 
Signed-off-by: Paul Mou <ppymou@gmail.com>
Upstream-commit: c5bf2145f172a264d3d8fc63d6717826b95b5ee2
Component: engine
 2015-03-25 20:31:02 -07:00
Jessica Frazelle
944966da9a fix 2 integration tests on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c959d26d2f413fa93b60174c4e19111eff0a845d
Component: engine
 2015-03-24 21:12:16 -07:00