Commit Graph
21804 Commits
Author SHA1 Message Date
Solomon Hykes c760729220 Merge branch 'pr-5353'
Upstream-commit: 0c5375146a6881d3a093523c2422b29679387743
Component: engine
2014-04-30 02:10:53 -07:00
Alexander LarssonandSolomon Hykes 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 MarmolandSolomon Hykes 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 DowideitandSolomon Hykes 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
Sam Rijs 20591f6a0e docs: DisableNetwork -> NetworkDisabled
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
Upstream-commit: 9651ff46bfc19b815e3f78bc5d6895a352db2d37
Component: engine
2014-04-29 21:18:26 +02:00
Victor Vieux 64742bd4a0 Merge pull request #5474 from crosbymichael/use-proper-scheme
Use proper scheme with static registry
Upstream-commit: 9d4771760af5326a2fff2e0bc091743331753253
Component: engine
2014-04-29 12:04:49 -07:00
Rohit Jnagal 3267a2a3bd Cleanup existing controllers when cleanup fails mid-way.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 070747a21365959d3179d8df627d3e614318e202
Component: engine
2014-04-29 18:59:20 +00:00
Victor Vieux 119b7b20d7 Merge pull request #4607 from vbatts/vbatts-static_registry
static registry support
Upstream-commit: 8a5060dba47ef9d91470c16e8ec3a9db59e60695
Component: engine
2014-04-29 11:22:44 -07:00
Michael Crosby a55ecec598 Add mountlabel to dev
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0c7143b32386c62cccd529de69abf88df938757d
Component: engine
2014-04-29 03:41:44 -07:00
Michael Crosby 620a842b2b Do not return labels when in privileged mode
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1a5ffef6c6ea8c5cc31c298bbdf6f7a29c60fbb8
Component: engine
2014-04-29 03:40:06 -07:00
Michael Crosby 20f9d39967 Add cli flag to docs for selinux support
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 64d0f7e39b395a3fc52f441a53f188a19bd53cf3
Component: engine
2014-04-29 03:40:06 -07:00
Michael Crosby b1dafd91c1 Update process labels to be set at create not start
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 46e05ed2d96efca9bdb466d20138fde1994769ba
Component: engine
2014-04-29 03:40:05 -07:00
Michael Crosby 563ccff2a7 Update devicemapper to pass mount flag
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ae006493054e524ed35c08863f1713986fe0a22c
Component: engine
2014-04-29 03:40:05 -07:00
Dan WalshandMichael Crosby 58dae079fd Fix SELinux errors caused by multi-threading
Occasionally the selinux_test program will fail because we are setting file
context based on the Process ID but not the TID.  THis change will always
use the TID to set SELinux labels.

Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: crosbymichael)
Upstream-commit: 12934ef3a40d814cb307dfea0cc86124ec997593
Component: engine
2014-04-29 03:40:05 -07:00
Dan WalshandMichael Crosby a5f91ab172 This patch reworks the SELinux patch to be only run on demand by the daemon
Added --selinux-enable switch to daemon to enable SELinux labeling.

The daemon will now generate a new unique random SELinux label when a
container starts, and remove it when the container is removed.   The MCS
labels will be stored in the daemon memory.  The labels of containers will
be stored in the container.json file.

When the daemon restarts on boot or if done by an admin, it will read all containers json files and reserve the MCS labels.

A potential problem would be conflicts if you setup thousands of containers,
current scheme would handle ~500,000 containers.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: crosbymichael)
Upstream-commit: b7942ec2ca7c7568df0c3b7eb554b05e2c3a3081
Component: engine
2014-04-29 03:40:05 -07:00
Michael Crosby 2acb87c29f Initial work on selinux patch
This has every container using the docker daemon's pid for the processes
label so it does not work correctly.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f0e6e135a8d733af173bf0b8732c704c9ec716d7
Component: engine
2014-04-29 03:40:05 -07:00
O.S. Tezer 096d11e72f Merge pull request #5458 from SvenDowideit/add-redirects-for-docker-io-pr-5414
add redirects from index/ -> docker-io/ and for the docker-io_api too
Upstream-commit: 797a4151a04ae5b3ad8aae6ed09a376e5c68108f
Component: engine
2014-04-29 12:37:22 +03:00
Michael Crosby 2b9bc2685b Use proper scheme with static registry
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 44d54ba0c299540efbfa173bf484d541e857f4ac
Component: engine
2014-04-29 02:01:07 -07:00
Sven Dowideit 0bb0e72f1c modernise the MAINTAINER process documentation to line up with what I understand it to be
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 48dbee082403a57b4dbc344e12b6724016d64b72
Component: engine
2014-04-29 15:28:04 +10:00
Tianon Gravi bbec633621 Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
Fixes #5122

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 659305085f551e39143636b1cfb8351a63cbab6f
Component: engine
2014-04-28 23:17:36 -06:00
Tianon Gravi fd54ea0e5f Update hack/dind to match the rest of our scripts
No functional changes here, just coding style and maintainability.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b1fe1797f3a808f38cec3d0b9a22556646163441
Component: engine
2014-04-28 23:16:40 -06:00
Tianon Gravi 8ec9474b1f Merge pull request #5433 from SvenDowideit/remove-sphinx-validation-from-build
Remove Travis Sphinx validation
Upstream-commit: 83999e70f412adcb62cdefecaaaf4d2b680011e5
Component: engine
2014-04-28 22:59:53 -06:00
Tianon Gravi 77a792666f Merge pull request #5459 from shykes/remove-bootcamp
Remove obsolete 'bootcamp' project.
Upstream-commit: a7f21570b6467ed4d6e5ba8ce104975b8d3a95c5
Component: engine
2014-04-28 22:59:20 -06:00
Tianon Gravi cc76f7eafc Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Creating the "docker save" tarball for "scratch" is pretty simple.  I've also extrapolated the "docker build -t busybox ." logic into a separate "hack/make/.ensure-busybox" file so that it can eventually be reused easier.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c8381d672226dd17f2e17f9cf9378f06d533911c
Component: engine
2014-04-28 22:26:25 -06:00
Solomon Hykes 1e62c9c969 Remove obsolete 'bootcamp' project.
It was a nice idea to recruit more maintainers but we never found the
time to do it properly...

I am still interested in any ideas to make it easier to start
contributing!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 46492ee65a26c8b3a138f4b9f5eea0e648dc8b45
Component: engine
2014-04-28 21:25:26 -07:00
Tianon Gravi bf6a9b5906 Update some whitespace in hack/make/test-integration-cli for consistency
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e4114e6b946dfc0f433fa0f6a9de42f80656ce08
Component: engine
2014-04-28 22:22:31 -06:00
Sven Dowideit c4b74db06d remove the sphinx validation - we'll add a MarkDown one when we have it
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 17fbe3de381c70ef852f8d1c50128299615d1ebe
Component: engine
2014-04-29 13:43:13 +10:00
Sven Dowideit 0b00adc06d Merge pull request #5438 from ostezer/docs-expand-viewport
Docs/CSS fix: Allow viewport expand to user's preference
Upstream-commit: 53c35412f9d6aef954cb5babccd5feca942a0939
Component: engine
2014-04-29 13:35:10 +10:00
Sven Dowideit 92323936f8 add redirects from index/ -> docker-io/ and for the docker-io_api too
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 33f36177e9648b182415a7928d3b4b5dc9d0265e
Component: engine
2014-04-29 13:33:22 +10:00
Sven Dowideit 7e080a1c66 Merge pull request #5414 from jamtur01/privreg
Addressed regression of private repository documentation.
Upstream-commit: 6c4e5ee826e1ae08674ef6e517c77583796a844b
Component: engine
2014-04-29 13:28:21 +10:00
James Turnbull 07b4141319 Merge pull request #5439 from ostezer/docs-mkdocs-theme-maintainer-update
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
Upstream-commit: 81d6c0f106b77ad135c2ab53691820c3239870fd
Component: engine
2014-04-28 23:12:10 -04:00
James Turnbull 5c01798cb2 Merge pull request #5441 from ostezer/docs-fix-notes-warnings-bg
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
Upstream-commit: 548cadd0a22d4dfc6fa3ab91cb6c6dbddbc2d07f
Component: engine
2014-04-28 23:09:13 -04:00
James Turnbull a8606685cc Merge pull request #5443 from ncdc/commit-api-doc-fix
Docs fix: correct /commit info
Upstream-commit: 6b5fd2daf7e16248258c10f394f33ceab0176e94
Component: engine
2014-04-28 23:09:04 -04:00
Michael Crosby d43500e59b Merge pull request #5455 from rjnagal/cgroup-stats
Add throttling stats for cpu cgroup
Upstream-commit: 69d56acd455de019cb324c4607c629be8d6fcad5
Component: engine
2014-04-28 17:53:37 -07:00
Rohit Jnagal f2e5f328eb Another test to check for invalid stats.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: d724242297bf2981ad9c7745e5b130ab7fa8f067
Component: engine
2014-04-29 00:32:05 +00:00