Commit Graph

495 Commits

Author SHA1 Message Date
Dhammika Pathirana c391368000 Null-term ioctl ifr_name strings
Docker-DCO-1.1-Signed-off-by: Dhammika Pathirana <dhammika@gmail.com> (github: dhammika)
2014-07-23 22:26:58 -07:00
Victor Marmol 6777537b30 Merge pull request #122 from tianon/makefile-rm
Add missing "--rm" on "make sh"
2014-07-23 18:03:12 -07:00
Tianon Gravi f8e987f731 Add missing "--rm" on "make sh"
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-23 18:58:16 -06:00
Victor Marmol 052947809d Merge pull request #120 from crosbymichael/add-tests1
Add busybox rootfs so we can run containers
2014-07-23 17:31:51 -07:00
Michael Crosby a0bee99d41 Add busybox rootfs so we can run containers
make sh will spawn a new container using the minimal.json file inside
busybox and you don't even know what is going on.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 17:14:27 -07:00
Victor Marmol 7d3cd408c4 Merge pull request #119 from vishh/fix_network_stats
Minor fixes to network stats
2014-07-23 15:15:01 -07:00
Vishnu Kannan 469957ccd7 Do not mark any network stats as 'omitempty' since the value '0' is legal for those stats.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-23 22:12:23 +00:00
Vishnu Kannan 2a81a149da Make NetworkStats a pointer to help the callers ignore that stats if it cannot be returned for any reason.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-23 21:18:58 +00:00
Michael Crosby 5d39cecc5f Merge pull request #117 from crosbymichael/add-integration-tests
Add integration tests with nice makefile
2014-07-23 13:56:27 -07:00
Michael Crosby feb1d28456 Use short flag for identifying integration tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 13:45:05 -07:00
Michael Crosby 00047d5339 Update travis to test specific packages
Add another netlink test and remove the -v from the dockerfile test
output
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 11:34:07 -07:00
Michael Crosby 39ce7cca29 Add code coverage to the tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 10:58:45 -07:00
Michael Crosby 4404b1521c Add start of netlink unit tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 10:41:10 -07:00
Michael Crosby 200f7191d7 Add makefile with build and test targets
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 10:40:55 -07:00
Michael Crosby 53a67a77b9 Update dockerfile for running tests
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-23 10:32:31 -07:00
Michael Crosby 80c1ae9051 Merge pull request #64 from vishh/runin
Adding RunIn to run a user specified command in an existing container.
2014-07-22 17:19:20 -07:00
Michael Crosby b2337e4860 Fix runin code for nsinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-22 19:50:00 +00:00
Vishnu Kannan bb85e2b07a 'nsinit exec' now uses namespaces.RunIn instead of namespaces.ExecIn.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-22 19:50:00 +00:00
Vishnu Kannan 1f2828770d Updated RunIn API to match the new console handling behavior in HEAD.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-22 19:49:59 +00:00
Vishnu Kannan 145299f9d8 Adding RunIn to run a user specified command in an existing container, wait for it to exit and return the exit code.
RunIn will connect to a user specified Terminal before running the command.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-22 19:49:59 +00:00
Michael Crosby 1f3d65f5fd Merge pull request #115 from tianon/travis-arm
Add "linux/arm" to Travis
2014-07-22 10:24:13 -07:00
Tianon Gravi 29d9a4d364 Add "linux/arm" to Travis
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-21 23:47:13 -06:00
Victor Marmol 2d0c1a1c01 Merge pull request #114 from vmarmol/cgroups
Small fix for GetAllCgroups().
2014-07-21 22:17:17 -07:00
Victor Marmol de63d7006b Small fix for GetAllCgroups().
Incorrect parsing of length of fields.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-07-21 18:55:06 -07:00
Michael Crosby 47d9567ccf Merge pull request #107 from vishh/dev_null
Reopening stdin, stdout and stderr if they are pointing to /dev/null.
2014-07-21 14:11:42 -07:00
Michael Crosby 00c55b3966 Merge pull request #46 from dhammika/44-delete-bridge
Add netlink hooks to delete a bridge dev #44
2014-07-21 11:29:24 -07:00
Michael Crosby 81c2d3aade Merge pull request #113 from tianon/travis-cgo
Add more Travis matrix targets (being explicit about CGO)
2014-07-21 11:18:37 -07:00
Tianon Gravi fbe52bc257 Add more Travis matrix targets (being explicit about CGO)
I've also updated the comments with the current status of the commented-out targets (since we're getting close to having them available for our Travis-use in the relevant upstreams).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-21 10:35:29 -06:00
Victor Marmol 926cd814d0 Merge pull request #112 from tianon/travis-cross-again
Add linux/386 testing back to Travis
2014-07-18 16:00:14 -07:00
Tianon Gravi b718ecfd7d Add linux/386 testing back to Travis
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-18 16:25:00 -06:00
Victor Marmol cf45d141db Merge pull request #111 from tianon/fix-cross
Fix 386 and arm cross-compile
2014-07-18 15:19:44 -07:00
Tianon Gravi 6fca833e4d Fix 386 and arm cross-compile
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-18 16:08:54 -06:00
Victor Marmol 818628ad11 Merge pull request #110 from crosbymichael/sysro
Initially mount /sys as ro instead of remount
2014-07-18 14:26:33 -07:00
Michael Crosby 0dcae82acb Initially mount /sys as ro instead of remount
The issue with doing a remount as ro with sysfs is that if a container
is still in one of the hosts namepsaces, commonly with the NET
namespace, the remount will cause the host's systems sysfs to be
remounted as ro also.  We can fix this correctly by not doing the
remount and just mount sys as ro in the first place.

The other remounts are individual files within proc so they will not
have this issue.

For context please see:
https://github.com/dotcloud/docker/issues/7101
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-18 14:13:38 -07:00
Vishnu Kannan c4f66a18ad Reopening stdin, stdout and stderr if they are pointing to /dev/null to not have '/dev/null' from the global namespace opened inside the container.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-07-18 02:22:11 +00:00
Michael Crosby 2e422fc2a1 Merge pull request #104 from tianon/more-generics
Update a few build tags to be more generic, ...
2014-07-17 11:42:48 -07:00
Victor Marmol 302da30828 Merge pull request #102 from crosbymichael/add-exec
Add Start to container API
2014-07-17 11:24:51 -07:00
Michael Crosby 8f3a8cf2de Add Exec to container API
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-17 11:06:07 -07:00
Tianon Gravi 1cdf742a82 Update a few build tags to be more generic, add a couple more SETNS constants, and update Travis with a bunch of fixes/tweaks (including removing the nonfunctional cross-compile stuff for now)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-17 02:24:49 -06:00
Michael Crosby 3c03998775 Merge pull request #101 from crosbymichael/selinux-build-tags
Add linux build tags for selinux
2014-07-16 17:00:48 -07:00
Michael Crosby a10820a78b Add linux build tags for selinux
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 16:24:28 -07:00
Michael Crosby be85764f10 Merge pull request #100 from crosbymichael/add-dockerfile
Add dockerfile
2014-07-16 15:02:02 -07:00
Michael Crosby 2374226175 Add dockerfile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 14:58:01 -07:00
Victor Marmol b30e0e150f Merge pull request #99 from crosbymichael/improve-term-handling
Remove terminal handling in libcontainer
2014-07-16 14:53:12 -07:00
Michael Crosby b56aa0658a Don't open slave in parent
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-15 18:24:15 -07:00
Michael Crosby 18e12838d6 Add resize of term in tty mode
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-15 17:44:18 -07:00
Michael Crosby 43b4258c46 Open with NOCTTY and set raw term
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-15 17:29:09 -07:00
Michael Crosby d661720fd7 Remove terminal handling in libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-15 16:55:11 -07:00
Michael Crosby fb3d909c28 Merge pull request #98 from thockin/netperf
Don't set the MTU for loopback interfaces.
2014-07-14 18:07:46 -07:00
Tim Hockin d25aa3cee7 Don't set the MTU for loopback interfaces.
Setting the MTU for loopback has a huge performance impact on intra-container
traffic. The loopback interface is not an ethernet interface and does not need
the same limit. with this change I see a 4x speedup for loopback throughput.

Docker-DCO-1.1-Signed-off-by: Tim Hockin <thockin@google.com> (github: thockin)
2014-07-15 01:01:26 +00:00