Commit Graph
7813 Commits
Author SHA1 Message Date
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 Walsh 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 Walsh 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
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
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
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
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
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
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
Michael Crosby 88a94167aa Merge pull request #5389 from tiborvass/5152-symlink-in-volume
Fixes #5152 : symlink in volume path
Upstream-commit: 934bd155653b490673a58e51ccb71ffc2f66e136
Component: engine
2014-04-28 17:27:18 -07:00
Rohit Jnagal 28c69597af Add cpu throttling stats.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 61f156d5215b2c9d38e26bbd732c6e9cb9a3208e
Component: engine
2014-04-29 00:18:18 +00:00
Tianon Gravi 17ade954e5 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
Upstream-commit: 093248840263a86955893c9d3e0710727f254897
Component: engine
2014-04-28 17:49:36 -06:00
Michael Crosby efc42748f5 Merge pull request #5451 from vmarmol/add-memory-stats
Adding a unit test for stats in pkg/cgroup/fs/memory.go
Upstream-commit: 5b3f7851d89be189c8daf2fa02d6bc39317c466a
Component: engine
2014-04-28 16:38:34 -07:00
Victor Vieux b3f05f4dd1 Merge pull request #5449 from tianon/remove-libcontainer-root-special-case
Remove "root" and "" special cases in libcontainer
Upstream-commit: eb6a1c9f499b5e0abbc1f5e040d69f1802deeb2f
Component: engine
2014-04-28 16:29:08 -07:00
Michael Crosby d77803d819 Merge pull request #5392 from rjnagal/libcontainer-fixes
Minor libcontainer fixes
Upstream-commit: fbc7a069f26b76c87b305efd3d71a9d46199f77c
Component: engine
2014-04-28 16:26:17 -07:00
Tianon Gravi 04e53d0381 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)
Upstream-commit: 314818e7ba4c675b63caaaabadcfd12d10c4f3a6
Component: engine
2014-04-28 17:08:03 -06:00
Rohit Jnagal 7fb7f768a7 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)
Upstream-commit: c44c51e3ce1680ec2a74fc62f246490f61d7590c
Component: engine
2014-04-28 23:04:04 +00:00
Victor Marmol f9852087ba Adding a unit test for pkg/cgroup/fs/memory.go
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 76f95294a316c1b545abe1fd17536da74779490b
Component: engine
2014-04-28 22:58:25 +00:00
Tianon Gravi a196538cc3 Remove "root" and "" special cases in libcontainer
These are unnecessary since the user package handles these cases properly already (as evidenced by the LXC backend not having these special cases).

I also updated the errors returned to match the other libcontainer error messages in this same file.

Also, switching from Setresuid to Setuid directly isn't a problem, because the "setuid" system call will automatically do that if our own effective UID is root currently: (from `man 2 setuid`)

    setuid() sets the effective user ID of the calling process.  If the
    effective UID of the caller is root, the real UID and saved set-user-
    ID are also set.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d98069030dc842741fdff16e1818f2a34ec0167f
Component: engine
2014-04-28 16:46:03 -06:00
Victor Vieux b1939f2d94 Merge pull request #5136 from cpuguy83/5080_fix_empty_volume_perms
Fixes permissions on volumes when dir in container is empty
Upstream-commit: af72ca199d2ff85316f6f519ea45e63329263439
Component: engine
2014-04-28 14:36:02 -07:00
Brian Goff cb6c5cfbb8 Fixes permissions on volumes when dir in container is empty
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: ff7b52abd3f26d9650c2e674400d58fbe8157ad8
Component: engine
2014-04-28 16:57:28 -04:00
Tibor Vass d6436680b6 Fixes #5152 : symlink in volume path
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: e9a42a45bfe296850a72ba6ee5e7c0c04534ea34
Component: engine
2014-04-28 13:18:12 -07:00
James Turnbull 4821b84026 Addressed regression of private repository documentation.
This adds back in the references to private repositories and
provides some refactoring to the Working with repositories
documentation including updating references to the "Central"
registry to Docker.io.

It also:

* Fixes some links and references to Central Index
* Fixes anchors in other files to updated titles in Working with Repositories.
* Renamed Central Index in the remaining places.
* Updated terms documentation to reflect Docker.io
* Updated some Docker Index naming to be consistent.
* Updates menu labels and hyperlinks.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: a8871b93b95d1220c860987ae1da4e49c943bfea
Component: engine
2014-04-28 16:08:55 -04:00
Solomon Hykes 6f6b2c01f3 Merge pull request #5422 from shykes/engine-spawn
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
Upstream-commit: d8332f433f667971e84d5ecfb30348797f50e83c
Component: engine
2014-04-28 12:56:02 -07:00
Michael Crosby 243c5c4d55 Merge pull request #5412 from vmarmol/add-blkio-test
Adding a test for blkio stats.
Upstream-commit: b386f2f558693a6b2c3578e5b0d876585be60df2
Component: engine
2014-04-28 12:50:20 -07:00
Michael Crosby 3f86c0fccf Merge pull request #5394 from vmarmol/add-croup-memory-stats
Add memory usage and max usage stats.
Upstream-commit: 3c5bac034862568f92e7bc5c7b8e4b313aea2b29
Component: engine
2014-04-28 12:44:34 -07:00
Andy Goldstein 1f9a09d037 Docs fix: correct /commit info
Correct documentation for POST /commit to reflect that the container's
configuration is supplied in the request body, and not as a query
parameter.

Also correct a small typo in the example JSON for create container.

Docker-DCO-1.1-Signed-off-by: Andy Goldstein <agoldste@redhat.com> (github: ncdc)
Upstream-commit: bba1dd046dd39405877c9f0b53502e68dddf36b1
Component: engine
2014-04-28 13:38:58 -04:00
Solomon Hykes 6104e9d68b Merge pull request #5431 from shykes/engine-len
engine.Len returns the number of keys in an env
Upstream-commit: 8fac9a345bb8e44bbe7b7cdce47b00f744a68623
Component: engine
2014-04-28 10:16:49 -07:00
O.S.Tezer 273a5bea05 Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
Docs' BG was original "#fff" and blocks such as code blocks or
warning-notes blocks were coloured in #F2F2F2.

In order to make it easier to read everything, the BG colour was
changed to #fff. However, the switch missed to convert other blocks'
BG colour.

This commit aims to re-introduce the correct contrast by changing the
BG colour of warning/notes block to #fff.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: abf3baf4ebfb8128ed4090165c65de0e3f4be278
Component: engine
2014-04-28 19:02:50 +03:00
O.S.Tezer 61af6f631a Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
So far it has been mostly my duty to create and maintain docs' design/theme.

This commit adds myself to the list of maintainers by modifying
the MAINTAINERS file under the docs/theme directory.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 442b70c65a48d4a0d0e543d95fb0d0085c97fd67
Component: engine
2014-04-28 18:36:40 +03:00
O.S.Tezer 498588df13 Docs/CSS fix: Aallow viewport expand to user's preference
This commit removes the "max-width" property of DOM "containers";
Thus letting the viewport to expand to fill the available space.

This commit aims to bring pleasure to Docker docs' readers' eyes,
And to make them happy by letting them profit more from their large
monitors. (or use more efficiently their smaller ones).

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: b6699111dbf4417dc1871b8e9217e842bcd14295
Component: engine
2014-04-28 18:30:31 +03:00
unclejack c1aee2c6db Merge pull request #5199 from shin-/registry_mirrors_support
Added support for multiple endpoints in X-Docker-Endpoints header
Upstream-commit: 425b3156953191707f002fb36e5f14b0355e9a3c
Component: engine
2014-04-28 17:56:57 +03:00
James Turnbull f234533b25 Merge pull request #4576 from Soulou/4549-doc-kill-signal-param
Add missing 'signal' parameter for kill endpoint
Upstream-commit: 41558744432f1399f7c2dd77178bc29ff6747705
Component: engine
2014-04-28 04:39:25 -04:00
Solomon Hykes cdda6fcada engine.Len returns the number of keys in an env
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 9b23178f585f65b9dc9558694d6de4207c479801
Component: engine
2014-04-28 00:37:42 -07:00
Solomon Hykes da3f4afb39 engine/spawn: run an engine in a subprocess, remote-controlled by Beam
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: b4b83ef8ae788cb7e016fbf90f0c1b890af7b23d
Component: engine
2014-04-27 14:11:46 -07:00
Solomon Hykes 823835353e Fix bug in engine.Sender
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 9236e088eb5a9a6d662b08ef7983dbecf01e6ef0
Component: engine
2014-04-27 14:11:45 -07:00