Commit Graph
11735 Commits
Author SHA1 Message Date
Michael Crosby c94cce9900 Remove container.json from readme
No need to duplicate this information when we already have a
container.json file in the root of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d0bee7939482b982462c5848f24b2e5e9ad897ea
Component: engine
2014-04-30 18:52:15 -07:00
Vincent Batts c808aa7e58 docker save: typo reference image, not container
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 93f8e277de63b4bcf6dc82b8c4b7abf81d614355
Component: engine
2014-04-30 21:51:03 -04:00
Michael Crosby b43bfc67a6 Make native driver use Exec func with different CreateCommand
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: da0d6dbd7b5b429b79ae4ea22957e8a14b4ca1ec
Component: engine
2014-04-30 18:49:24 -07:00
Michael Crosby c0992a66d2 Fix execin with environment and Enabled support
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: aa9705f832d847d6e6ce76e19f3c952c194c167e
Component: engine
2014-04-30 18:24:47 -07:00
Michael Crosby 4b320ae74d Integrate new structure into docker's native driver
This duplicates some of the Exec code but I think it it worth it because
the native driver is more straight forward and does not have the
complexity have handling the type issues for now.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 60e4276f5af360dd3292e22993c0c132a86edc2e
Component: engine
2014-04-30 18:20:01 -07:00
Sven Dowideit d799d709fb Don't add yourself to the AUTHORs file - its generated
Last time I discussed this with @tianon, the AUTHORS was being
regenerated regularly, so we could remove this step.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b06ad88ca0a94c63f0c45d00e3478e5e7fd808fa
Component: engine
2014-05-01 11:15:07 +10:00
Michael Crosby 8cf0bc757c Remove command factory and NsInit interface from libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 176c49d7a9e5a81b6c80e18dea84864148360597
Component: engine
2014-04-30 17:55:15 -07:00
Michael Crosby 3b07a6b498 Export more functions from libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b6b0dfdba7bda13d630217830423580c3152899d
Component: engine
2014-04-30 17:18:07 -07:00
Michael Crosby 04ee258620 Split term files to make it easier to manage
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: aecb9c39ab0eb5f09ebab40001fe0ff639ef617b
Component: engine
2014-04-30 17:04:24 -07:00
Michael Crosby 2b44341c25 Export syncpipe fields
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a3e96abb5aacaa763f3f9205316dd0aef1977f16
Component: engine
2014-04-30 17:02:45 -07:00
Guillaume J. Charmes 3c350a7bfd Merge pull request #5511 from crosbymichael/refactor-libcontainer
Refactor: remove statewriter type and all callback for process start
Upstream-commit: 26ac05c8bce47fd37c35e43b98cdbcfb65a5c9bb
Component: engine
2014-04-30 16:50:57 -07:00
Guillaume J. Charmes 47e64912c0 Merge pull request #5512 from crosbymichael/set-freezer
Add ability to set cgroups freezer
Upstream-commit: be013c7820747af5e3696ad306b817aa437dd3c4
Component: engine
2014-04-30 16:50:01 -07:00
Michael Crosby 4188748bd6 Add ability to set cgroups freezer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5f6fda8cfd05dec002894d3e2214a04a58b62bed
Component: engine
2014-04-30 16:07:12 -07:00
Michael Crosby e0c447076a Remove statewriter interface, export more libcontainer funcs
This temp. expands the Exec method's signature but adds a more robust
way to know when the container's process is actually released and begins
to run.  The network interfaces are not guaranteed to be up yet but this
provides a more accurate view with a single callback at this time.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f1104014372e71e1f8ae7a63d17e18de5e2fa93a
Component: engine
2014-04-30 15:52:40 -07:00
Michael Crosby c5e3da18ab Export SetupUser
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cd8cec854be33a74179618864cd528acf5129cd9
Component: engine
2014-04-30 15:27:59 -07:00
Michael Crosby 26fc4488a8 Remove logger from nsinit struct
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 162dafbcd5c4d57c7f436e11d90423ee6d7c3ce1
Component: engine
2014-04-30 15:24:18 -07:00
Michael Crosby 2bc0a4b67c Merge pull request #5498 from tianon/better-apparmor-missing-error
Upstream-commit: bfedf247a46acc6deceeaef5703b76026691d42b
Component: engine
2014-04-30 15:16:43 -07:00
Guillaume J. Charmes 87fcb82bfa Merge pull request #5448 from crosbymichael/selinux-defaults
Add selinux label support for processes and mount
Upstream-commit: 2a711d16e05b69328f2636f88f8eac035477f7e4
Component: engine
2014-04-30 14:14:39 -07:00
Michael Crosby 6835a0cd51 Merge pull request #5506 from crosbymichael/add-system-maintainer
Add system maintainers
Upstream-commit: 2fc5bed61d14d22a5d50afc5416c87930c5fbd96
Component: engine
2014-04-30 14:14:21 -07:00
Tibor Vass 74d365d59a Fix bridge ip comparison
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 986c647d5ac9bda0633cdeb927bb782d8df02269
Component: engine
2014-04-30 12:36:16 -07:00
Michael Crosby bf18e83e5d Merge pull request #5464 from tianon/close-leftover-fds
Upstream-commit: e88ef454b7a8705570623e6d26f51731b8300e0f
Component: engine
2014-04-30 12:27:52 -07:00
Solomon Hykes 0ff7aa326b Make Jerome Petazzoni a maintainer for dind
In the spirit of getting more contributors to maintain their
components.. I nominate @jpetazzo ot maintain dind (he's the original
author).

@jpetazzo I don't expect this to be too much load, but it's a good and
symbolic start :)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1fd919bbf41e68cd38a4794e1f8e3d585650a231
Component: engine
2014-04-30 12:20:52 -07:00
Michael Crosby b55f9defa8 Add system maintainers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6203d8b462ee9dbc42b651ac8b6b2d83b9eef963
Component: engine
2014-04-30 12:01:06 -07:00
Victor Vieux 91ec6d65ce Merge pull request #5502 from tianon/remove-contrib-zfs
Remove contrib/zfs directory
Upstream-commit: f5e5777e6359378261b176708dfe4f1853f93814
Component: engine
2014-04-30 11:03:13 -07:00
Bryan Matsuo a71820a585 FIXES #5398: pkg/graphdb build only dependent on cgo tag
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com> (github: bmatsuo)
Upstream-commit: 99284a24e76bf52582e5b70ad28b6371bd4f4b42
Component: engine
2014-04-30 11:57:10 -06:00
Tianon Gravi 5ce64c0f94 Remove contrib/zfs directory
A WIP pull request or issue for discussion would be a better avenue for collaboration and discussion of a ZFS backend.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0037dc8d60bc22e34838e15efaa1041ea2826c2c
Component: engine
2014-04-30 11:56:14 -06:00
Victor Vieux b9c2a63b00 Merge pull request #5500 from tianon/fix-maintainers-format
Fix various MAINTAINERS format inconsistencies
Upstream-commit: e8f8f1c72963e1c9511ea6aedcd8a1f53c5da277
Component: engine
2014-04-30 10:55:45 -07:00
Johannes 'fish' Ziemke bf9d02ea77 Add notes about git commit messages
This improves readability of commits a lot and is easy to
follow. I think most people follow those rules already. They are based
on http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 5f00372af2e0aa0ec540830ba575fe83ae16017f
Component: engine
2014-04-30 19:28:26 +02:00
Tianon Gravi bde45636d6 Fix various MAINTAINERS format inconsistencies
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
2014-04-30 11:22:11 -06:00
Bryan Matsuo 86a52049b2 update AUTHORS
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com> (github: bmatsuo)
Upstream-commit: 8caef610b2548273d48ace696d3a90ba0b510d66
Component: engine
2014-04-30 11:08:57 -06:00
unclejack 68135ccf7d check if the daemon is run as root on startup
This commit makes Docker throw an error if the daemon isn't started as
root.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4fac4d2149856f0740a98e87ef0e0e6bd04d1b53
Component: engine
2014-04-30 14:13:39 +03:00
Solomon Hykes c760729220 Merge branch 'pr-5353'
Upstream-commit: 0c5375146a6881d3a093523c2422b29679387743
Component: engine
2014-04-30 02:10:53 -07:00
Alexander Larsson 23a6b19cdc beam: Add more tests to unix_test.go
These are failing, and indicate things that need to be fixed.  The
primarily problem is the lack of framing between beam messages.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
[solomon@docker.com: rebased on master]
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: e802b69146ac7a008d943a3a289fba56150b4f81
Component: engine
2014-04-30 02:10:09 -07:00
Victor Marmol bbcaf9ab18 Add new test-unit make rule which only runs the unit tests. Renames test
bundle to test-unit.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 494c789ac34d3f22d5f6275937155e0aa2647374
Component: engine
2014-04-30 02:10:09 -07:00
Sven Dowideit 25c14cce30 for want of a comma, the kingdom was lost
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 9e2e26c69a52c0b55d31de477a652731f87b4558
Component: engine
2014-04-30 02:10:09 -07:00
Tianon Gravi 2256dd9cdf Update pkg/apparmor to provide a better error message when apparmor_parser cannot be found
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a1a9baf926ff8ec2bd7ba0dd39cf3a9eb5fab1d3
Component: engine
2014-04-29 23:19:21 -06:00
Tianon Gravi 659a79c68f Merge pull request #5484 from vmarmol/add-test-unit
Add new test-unit make rule which only runs the unit tests
Upstream-commit: 70b56529847cf0c1fa58e5060c2a471701801f98
Component: engine
2014-04-29 23:15:16 -06:00
James Turnbull daed0fd4e2 Merge pull request #5487 from SvenDowideit/docs-fix-invalid-json
for want of a comma, the kingdom was lost
Upstream-commit: 48388b81787dcae4ce13dc75277c3209bbb258a1
Component: engine
2014-04-29 22:28:59 -04:00
Solomon Hykes 760aa19df4 Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
Upstream-commit: 20e9f61971a858baef1c8035f5f08ceefdc7c92d
Component: engine
2014-04-29 17:41:16 -07:00
Sven Dowideit 6630e05dd5 for want of a comma, the kingdom was lost
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ebaff50bd2c94f2353f4bd738e077c7baef3e879
Component: engine
2014-04-30 10:12:21 +10:00
Victor Marmol 79d31745eb Add new test-unit make rule which only runs the unit tests. Renames test
bundle to test-unit.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
Tianon Gravi 614fad87b9 Close extraneous file descriptors in containers
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :)

Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d5d62ff95574a48816890d8d6e0785a79f559c3c
Component: engine
2014-04-29 16:45:28 -06:00
Tianon Gravi 55792f63be Merge pull request #5477 from vmarmol/add-testdirs
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
Upstream-commit: a96cac4d7d42db757f9387ff1352ebedfc7b557e
Component: engine
2014-04-29 16:40:40 -06:00
O.S. Tezer 1c4e288ba8 Merge pull request #5440 from ostezer/docs-improve-code-block-rendering
Docs/CSS: Amend code block rendering.
Upstream-commit: 34a3d41d17a3f7090680b2f240a540c40184c573
Component: engine
2014-04-30 00:45:04 +03:00
Guillaume J. Charmes 4478918ea3 Merge pull request #5460 from tianon/no-pull-scratch
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Upstream-commit: 2c85468753509c442a675d79de0e65476468c453
Component: engine
2014-04-29 14:37:06 -07:00
O.S. Tezer f3278d6d2b Merge pull request #5478 from amangoel/patch-1
Update working-with-docker.md
Upstream-commit: 473b7a6c93c37506583169c4476ea341f0d96507
Component: engine
2014-04-30 00:00:14 +03:00
Victor Marmol f54d99728b Add a TESTDIRS variable to the test bundle to allow for the running of a
single go directory worth of tests.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 6e05c420c9b7e4660b391643be21720d6f80e18d
Component: engine
2014-04-29 20:55:04 +00:00
amangoel dd5d56fcd2 Update working-with-docker.md
Upstream-commit: 83a5f2a192f4c8bb87e9cbd80df42a0496615a1a
Component: engine
2014-04-29 13:49:36 -07:00
O.S. Tezer f36305e10a Merge pull request #5475 from srijs/patch-1
docs: DisableNetwork -> NetworkDisabled
Upstream-commit: 1bc0f82406692655cfeb6467ebf24328e2d17603
Component: engine
2014-04-29 23:43:28 +03:00
Michael Crosby fdcad5e0a4 Merge pull request #5476 from rjnagal/libcontainer-fixes
Cleanup cgroups on Set failures
Upstream-commit: bf59e6723274c6d20d7c78c683b5c8923a6d910e
Component: engine
2014-04-29 12:27:31 -07:00