0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15371 commits 14 branches 412 tags 338 MiB
Commit graph

260 commits

Author SHA1 Message Date
Michael Crosby
f25bbedc85 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>
 2015-05-07 14:43:39 -07:00
Michael Crosby
a7a51306b1 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>
 2015-05-07 14:42:23 -07:00
Michael Crosby
27ae108b4e Mount RO for timer_stats and latency_stats in proc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-07 14:42:23 -07:00
Michael Crosby
d87da59c79 Prevent write access to /proc/asound 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	integration-cli/docker_cli_run_test.go
 2015-05-07 14:42:23 -07:00
Jessie Frazelle
74bfa36753 Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
 2015-05-07 14:01:16 -07:00
Arnaud Porterie
f42348e18f 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>
 2015-05-04 16:07:45 -07:00
mauriyouth
7d371c0b47 Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-04 21:30:52 +02:00
Antonio Murdaca
4203230cbb 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>
 2015-04-29 17:02:22 +02:00
David Mackey
3941623fbc trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
 2015-04-27 13:35:08 -07:00
Aidan Hobson Sayers
f30d1c1835 Prevent deadlock on attempt to use own net 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-04-27 14:57:37 +01:00
Alexander Morozov
a9688cdca5 Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-24 10:37:21 -07:00
Alexander Morozov
799cf056e7 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
 2015-04-23 13:07:40 -07:00
Srini Brahmaroutu
231d362db7 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-23 18:25:18 +00:00
Antonio Murdaca
ee7a7b07e7 Remove deleteAllContainers call in test 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 16:32:50 +02:00
Alexander Morozov
dc944ea7e4 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>
 2015-04-21 10:28:52 -07:00
Jessie Frazelle
17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Phil Estes
435643545c Merge pull request #12450 from brahmaroutu/integration_test3_12255 
Port test from integration tests - test low memory on create
 2015-04-20 17:27:17 -04:00
Srini Brahmaroutu
1a35b16b08 Port test from integration tests 
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-04-20 17:57:53 +00:00
buddhamagnet
cdd5d5e4c3 fix typo 
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
 2015-04-20 18:56:21 +01:00
Lei Jitang
dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Arnaud Porterie
5fd378c0d1 Merge pull request #12466 from robertabbott/fix_dockerCmd 
Removed unnecessary error output from dockerCmd
 2015-04-17 15:15:34 -07:00
bobby abbott
621b601b3c 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>
 2015-04-17 09:11:14 -07:00
Antonio Murdaca
a0bf80fe03 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-17 14:27:38 +02:00
Qiang Huang
8077b2fb80 add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:33:46 +08:00
Brian Goff
9b4d9a3421 Move TestRunWithTooLowMemory to integration-cli 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-13 16:40:48 -04:00
Alexander Morozov
ac8bd12b39 Get process list after PID 1 dead 
Fix #11087

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-10 16:23:57 -07:00
Jessica Frazelle
255b84444a cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-08 16:59:36 -07:00
Alexander Morozov
ce69dafe4d Test case for network mode chain container -> container -> host 
Issue #12130

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

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-06 09:21:18 -04:00
Doug Davis
8d1455d88b 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>
 2015-03-31 16:57:43 -07:00
Jessie Frazelle
749a117267 Merge pull request #11934 from cpuguy83/fix_volume_symlink_check 
Fix volume symlink check
 2015-03-31 13:56:23 -07:00
Brian Goff
63708dca8a Use getResourcePath instead 
Also cleans up tests to not shell out for file creation.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-31 15:10:30 -04:00
Lei Jitang
7583b49125 Fix create volume in a directory which is a symbolic link 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-29 13:35:36 +08:00
Lei Jitang
013fb87543 Fix error from daemon no such image even when the image exist 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-28 09:07:20 +08:00
Alexander Morozov
240f3e14c7 Merge pull request #11848 from duglin/CleanupIntTests 
Clean up integration-cli tests
 2015-03-27 14:11:56 -07:00
Doug Davis
9a9d23dbc4 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>
 2015-03-26 17:25:50 -07:00
Peter Choi
ae907e7af1 Changed snake case naming to camelCase 
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
 2015-03-26 15:05:45 -06:00
Michael Crosby
a196cc943c Merge pull request #11791 from moo-mou/11768-vetwarning 
Fix vet warning
 2015-03-26 10:52:07 -07:00
Jake Champlin
c2fe262439 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>
 2015-03-25 23:46:04 -04:00
paul
c5bf2145f1 Fix vet warning 
Signed-off-by: Paul Mou <ppymou@gmail.com>
 2015-03-25 20:31:02 -07:00
Jessica Frazelle
c959d26d2f fix 2 integration tests on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:16 -07:00
Jessie Frazelle
d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07:00
Antonio Murdaca
d124197cc7 Remove container if --rm flag is passed and container cannot be started 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 13:03:31 +01:00
bobby abbott
a91b2431a3 Refactor pkg/networkfs 
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-03-22 23:53:47 -07:00
Lei Jitang
74664dabff Fix hostname missing when a container's net mode is contaienr mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-19 17:03:40 +08:00
Arnaud Porterie
cb77ad4757 Merge pull request #11369 from coolljt0725/fix_link 
Fix --link to a container which net mode is container
 2015-03-17 08:36:33 -07:00
Lei Jitang
82e2e1a11a Fix --link to a container which net mode is container mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-17 07:50:12 -07:00
s00318865
173642c866 verify MaximumRetryCount for container restart policy 
Signed-off-by: s00318865 <sunyuan3@huawei.com>
 2015-03-17 13:20:25 +08:00
Arnaud Porterie
bc7d1d6ef3 Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig 
move resource options from Config to hostConfig
 2015-03-15 17:30:46 -07:00
Ahmet Alp Balkan
004ac85aa2 integ-cli: remove ICMP dependency from test, use nslookup 
As we started running CI machines on Azure cloud and Azure
doesn't have ICMP stack implemented by replacing
`ping 8.8.8.8` with `nslookup google.com`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-11 14:27:11 -07:00