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

307 commits

Author SHA1 Message Date
Sebastiaan van Stijn
637023a5f8 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode 
Add --net=container with --publish --expose --publish-all error out
 2015-06-15 16:25:59 +02:00
Jessica Frazelle
0adfb908a6 fix lxc build 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-05 09:50:30 -07:00
Zefan Li
e55649192e test: Skip TestDevicePermissions on lxc 
Closes: #13641

Signed-off-by: Zefan Li <lizefan@huawei.com>
 2015-06-02 10:27:54 +08:00
Phil Estes
71d960d455 Merge pull request #13557 from ewindisch/apparmor-unshare-priv 
Expand unshare test to include privileged test
 2015-06-01 15:43:37 -04:00
David R. Jenni
c913c9921b Fix issue #10184. 
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.

Signed-off-by: David R. Jenni <david.r.jenni@gmail.com>
 2015-05-30 11:09:47 +02:00
David Calavera
a914101296 Do not require cgroups capabilities on windows to run the integration tests. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-29 11:42:40 -07:00
Eric Windisch
e58161fedc Expand unshare test to include privileged test 
This ensures that AppArmor, not other mechanisms used
by Docker or the kernel is restricting the mount.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-05-28 16:49:48 -04:00
Jessie Frazelle
5bb6262d88 Merge pull request #13529 from hqhq/hq_skip_cgroup_test 
Skip test if not have Cpu quota or Cpu period
 2015-05-28 10:57:32 -07:00
Qiang Huang
34e5b6af19 Skip test if not have Cpu quota or Cpu period 
Closes: #13522

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-28 14:59:58 +08:00
Lei Jitang
13f2aa7068 Add --net=container with --publish --publish-all --expose error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 15:31:06 +08:00
Jessica Frazelle
a08fb73f93 fix lxc tests unshare, they dont use our apparmor profile 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-26 10:31:21 -07:00
Sebastiaan van Stijn
aee9ac302d Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test 
add unshare apparmor profile test
 2015-05-26 17:32:45 +02:00
Arnaud Porterie
bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Alexander Morozov
89582f9781 Merge pull request #13403 from hqhq/hq_fix_ipcmode_check 
Don't check running container at create time
 2015-05-23 08:32:51 -07:00
David Calavera
d592778f4a Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-22 16:43:34 -07:00
Qiang Huang
84aae5a226 Don't check running container at create time 
We should let user create container even if the container he wants
join is not running, that check should be done at start time.

In this case, the running check is done by getIpcContainer() when
we start container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-23 07:15:14 +08:00
Zhang Wei
6809fa6861 Delete "defer deleteAllContainers()" from integration-cli 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-22 17:01:52 +08:00
David Calavera
81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Qiang Huang
c0dd8538db Fix test failure when --net none build 
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-22 08:21:09 +08:00
Jessica Frazelle
6f75dd85c5 add unshare apparmor profile test 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-20 14:06:00 -07:00
Jana Radhakrishnan
afd901e408 Fix network connectivity problem for non-root users 
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-20 17:51:20 +00:00
Alexander Morozov
7e5902c92d Test for two containers in --net=host 
This is test for regression which was encountered during libnetwork
merging.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-20 09:35:28 -07:00
Lorenzo Fontana
086b514f6a Removed deleteContainer calls 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-05-20 08:38:23 +02:00
Jana Radhakrishnan
d18919e304 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:19 +00:00
Michael Crosby
aac645ae04 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
 2015-05-18 13:06:21 -07:00
Brian Goff
ccf02a9f77 Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
 2015-05-18 14:53:37 -04:00
Doug Davis
3b1f73fbcd Remove use of 'bash' from our tests 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-18 11:29:08 -07:00
Qiang Huang
74f8a4eca4 Use inspectField to simplify code 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-18 10:06:13 +08:00
Lei Jitang
9a09664b51 Fix automatically publish ports without --publish-all 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-18 02:57:17 +08:00
Antonio Murdaca
a268e36719 Clean tests from not needed inspect call 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-16 18:12:54 +02:00
Alexander Morozov
b2ad9314a2 Merge pull request #13196 from crosbymichael/update-libocntainer-may13 
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
 2015-05-14 10:49:25 -07:00
Sebastiaan van Stijn
ed25742002 Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
 2015-05-13 18:30:32 -07:00
Darren Shepherd
f2e5207fc9 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-13 17:56:32 -07:00
Michael Crosby
677d76cd4a Update test for /sys mounting 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-13 15:02:53 -07:00
Jessie Frazelle
ebe9a85486 Merge pull request #13183 from runcom/fix-typo-tests-grouping 
Fix typo to run tests grouped by RunUnprivileged
 2015-05-13 11:33:14 -07:00
Antonio Murdaca
a36f6a140b Fix typo to run tests grouped by RunUnprivileged 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-13 14:24:54 +02:00
unclejack
fdec5197f1 integcli: change Dettach to Detach 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-13 12:49:19 +03:00
Doug Davis
0024935f64 Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-12 17:22:41 -07:00
Ma Shimiao
dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
Jessica Frazelle
52118df432 fix lxc because it doesnt have the hardened libcontainer stuff 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-07 17:40:37 -07:00
Jessie Frazelle
6b6a26c769 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
 2015-05-07 17:13:32 -07:00
Jessie Frazelle
de32f5c431 Merge pull request #11802 from hqhq/hq_add_blkio_weight 
add blkio.weight support
 2015-05-07 17:10:39 -07:00
Jessie Frazelle
e03ac8d5b9 Merge pull request #12175 from dqminh/fix-allocate-port 
#12148: sort ports mapping before allocating
 2015-05-07 17:04:20 -07:00
Jessica Frazelle
2c2f6fd272 bump version back to 1.7.0-dev 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-07 15:42:36 -07:00
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
Qiang Huang
f133f11a7d 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>
 2015-05-07 11:55:58 +08:00