48388b8178
Merge pull request #5487 from SvenDowideit/docs-fix-invalid-json
...
for want of a comma, the kingdom was lost
2014-04-29 22:28:59 -04:00
20e9f61971
Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
2014-04-29 17:41:16 -07:00
ebaff50bd2
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-30 10:12:21 +10:00
a39f3c9200
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)
2014-04-29 23:26:27 +00:00
d5d62ff955
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)
2014-04-29 16:45:28 -06:00
a96cac4d7d
Merge pull request #5477 from vmarmol/add-testdirs
...
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
2014-04-29 16:40:40 -06:00
34a3d41d17
Merge pull request #5440 from ostezer/docs-improve-code-block-rendering
...
Docs/CSS: Amend code block rendering.
2014-04-30 00:45:04 +03:00
2c85468753
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)
2014-04-29 14:37:06 -07:00
473b7a6c93
Merge pull request #5478 from amangoel/patch-1
...
Update working-with-docker.md
2014-04-30 00:00:14 +03:00
6e05c420c9
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)
2014-04-29 20:55:04 +00:00
83a5f2a192
Update working-with-docker.md
2014-04-29 13:49:36 -07:00
1bc0f82406
Merge pull request #5475 from srijs/patch-1
...
docs: DisableNetwork -> NetworkDisabled
2014-04-29 23:43:28 +03:00
bf59e67232
Merge pull request #5476 from rjnagal/libcontainer-fixes
...
Cleanup cgroups on Set failures
2014-04-29 12:27:31 -07:00
9651ff46bf
docs: DisableNetwork -> NetworkDisabled
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
2014-04-29 21:18:26 +02:00
9d4771760a
Merge pull request #5474 from crosbymichael/use-proper-scheme
...
Use proper scheme with static registry
2014-04-29 12:04:49 -07:00
070747a213
Cleanup existing controllers when cleanup fails mid-way.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-04-29 18:59:20 +00:00
8a5060dba4
Merge pull request #4607 from vbatts/vbatts-static_registry
...
static registry support
2014-04-29 11:22:44 -07:00
0c7143b323
Add mountlabel to dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-29 03:41:44 -07:00
1a5ffef6c6
Do not return labels when in privileged mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-29 03:40:06 -07:00
64d0f7e39b
Add cli flag to docs for selinux support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-29 03:40:06 -07:00
46e05ed2d9
Update process labels to be set at create not start
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-29 03:40:05 -07:00
ae00649305
Update devicemapper to pass mount flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-29 03:40:05 -07:00
12934ef3a4
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)
2014-04-29 03:40:05 -07:00
b7942ec2ca
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)
2014-04-29 03:40:05 -07:00
f0e6e135a8
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)
2014-04-29 03:40:05 -07:00
797a4151a0
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
2014-04-29 12:37:22 +03:00
44d54ba0c2
Use proper scheme with static registry
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-29 02:01:07 -07:00
b1fe1797f3
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)
2014-04-28 23:16:40 -06:00
83999e70f4
Merge pull request #5433 from SvenDowideit/remove-sphinx-validation-from-build
...
Remove Travis Sphinx validation
2014-04-28 22:59:53 -06:00
a7f21570b6
Merge pull request #5459 from shykes/remove-bootcamp
...
Remove obsolete 'bootcamp' project.
2014-04-28 22:59:20 -06:00
c8381d6722
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)
2014-04-28 22:26:25 -06:00
46492ee65a
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)
2014-04-28 21:25:26 -07:00
e4114e6b94
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)
2014-04-28 22:22:31 -06:00
17fbe3de38
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)
2014-04-29 13:43:13 +10:00
53c35412f9
Merge pull request #5438 from ostezer/docs-expand-viewport
...
Docs/CSS fix: Allow viewport expand to user's preference
2014-04-29 13:35:10 +10:00
33f36177e9
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)
2014-04-29 13:33:22 +10:00
6c4e5ee826
Merge pull request #5414 from jamtur01/privreg
...
Addressed regression of private repository documentation.
2014-04-29 13:28:21 +10:00
81d6c0f106
Merge pull request #5439 from ostezer/docs-mkdocs-theme-maintainer-update
...
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
2014-04-28 23:12:10 -04:00
548cadd0a2
Merge pull request #5441 from ostezer/docs-fix-notes-warnings-bg
...
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
2014-04-28 23:09:13 -04:00
6b5fd2daf7
Merge pull request #5443 from ncdc/commit-api-doc-fix
...
Docs fix: correct /commit info
2014-04-28 23:09:04 -04:00
69d56acd45
Merge pull request #5455 from rjnagal/cgroup-stats
...
Add throttling stats for cpu cgroup
2014-04-28 17:53:37 -07:00
d724242297
Another test to check for invalid stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-04-29 00:32:05 +00:00
934bd15565
Merge pull request #5389 from tiborvass/5152-symlink-in-volume
...
Fixes #5152 : symlink in volume path
2014-04-28 17:27:18 -07:00
61f156d521
Add cpu throttling stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-04-29 00:18:18 +00:00
0932488402
Merge pull request #5450 from tianon/update-deb-cgroup-dep
...
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
2014-04-28 17:49:36 -06:00
5b3f7851d8
Merge pull request #5451 from vmarmol/add-memory-stats
...
Adding a unit test for stats in pkg/cgroup/fs/memory.go
2014-04-28 16:38:34 -07:00
eb6a1c9f49
Merge pull request #5449 from tianon/remove-libcontainer-root-special-case
...
Remove "root" and "" special cases in libcontainer
2014-04-28 16:29:08 -07:00
fbc7a069f2
Merge pull request #5392 from rjnagal/libcontainer-fixes
...
Minor libcontainer fixes
2014-04-28 16:26:17 -07:00
314818e7ba
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
...
I tested to verify that if neither package is available (for example, on Debian Wheezy), apt still continues installing properly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-28 17:08:03 -06:00
c44c51e3ce
Merge branch 'master' into libcontainer-fixes
...
Conflicts:
pkg/libcontainer/README.md
pkg/libcontainer/container.json
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-04-28 23:04:04 +00:00
James Turnbull
Solomon Hykes
Sven Dowideit
Victor Marmol
Tianon Gravi
O.S. Tezer
Guillaume J. Charmes
amangoel
Michael Crosby
Sam Rijs
Victor Vieux
Rohit Jnagal
Michael Crosby
Dan Walsh