James Turnbull
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
James Turnbull
6b5fd2daf7
Merge pull request #5443 from ncdc/commit-api-doc-fix
...
Docs fix: correct /commit info
2014-04-28 23:09:04 -04:00
Michael Crosby
69d56acd45
Merge pull request #5455 from rjnagal/cgroup-stats
...
Add throttling stats for cpu cgroup
2014-04-28 17:53:37 -07:00
Rohit Jnagal
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
Michael Crosby
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
Rohit Jnagal
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
Tianon Gravi
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
Michael Crosby
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
Victor Vieux
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
Michael Crosby
fbc7a069f2
Merge pull request #5392 from rjnagal/libcontainer-fixes
...
Minor libcontainer fixes
2014-04-28 16:26:17 -07:00
Tianon Gravi
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
Rohit Jnagal
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
Victor Marmol
76f95294a3
Adding a unit test for pkg/cgroup/fs/memory.go
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-28 22:58:25 +00:00
Tianon Gravi
d98069030d
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)
2014-04-28 16:46:03 -06:00
Victor Vieux
af72ca199d
Merge pull request #5136 from cpuguy83/5080_fix_empty_volume_perms
...
Fixes permissions on volumes when dir in container is empty
2014-04-28 14:36:02 -07:00
Brian Goff
ff7b52abd3
Fixes permissions on volumes when dir in container is empty
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-04-28 16:57:28 -04:00
Tibor Vass
e9a42a45bf
Fixes #5152 : symlink in volume path
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-04-28 13:18:12 -07:00
Solomon Hykes
d8332f433f
Merge pull request #5422 from shykes/engine-spawn
...
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
2014-04-28 12:56:02 -07:00
Michael Crosby
b386f2f558
Merge pull request #5412 from vmarmol/add-blkio-test
...
Adding a test for blkio stats.
2014-04-28 12:50:20 -07:00
Michael Crosby
3c5bac0348
Merge pull request #5394 from vmarmol/add-croup-memory-stats
...
Add memory usage and max usage stats.
2014-04-28 12:44:34 -07:00
Andy Goldstein
bba1dd046d
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)
2014-04-28 13:38:58 -04:00
Solomon Hykes
8fac9a345b
Merge pull request #5431 from shykes/engine-len
...
engine.Len returns the number of keys in an env
2014-04-28 10:16:49 -07:00
O.S.Tezer
abf3baf4eb
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)
2014-04-28 19:02:50 +03:00
unclejack
425b315695
Merge pull request #5199 from shin-/registry_mirrors_support
...
Added support for multiple endpoints in X-Docker-Endpoints header
2014-04-28 17:56:57 +03:00
James Turnbull
4155874443
Merge pull request #4576 from Soulou/4549-doc-kill-signal-param
...
Add missing 'signal' parameter for kill endpoint
2014-04-28 04:39:25 -04:00
Solomon Hykes
9b23178f58
engine.Len returns the number of keys in an env
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-28 00:37:42 -07:00
Solomon Hykes
b4b83ef8ae
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)
2014-04-27 14:11:46 -07:00
Solomon Hykes
9236e088eb
Fix bug in engine.Sender
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-27 14:11:45 -07:00
Solomon Hykes
62f4c88443
Merge pull request #5374 from shykes/beam-engine
...
Remote communication between engines using beam
2014-04-27 14:10:59 -07:00
O.S. Tezer
44c69c1d87
Merge pull request #5425 from jlhawn/io-auth-accounts-api-docs
...
Merged.
2014-04-27 21:40:03 +03:00
Josh Hawn
c6060a3b25
Added back OAuth and Accounts API docs pages
...
Removed a now unused endpoint from the accounts API.
Updated some of the accounts links to point to www.docker.io
as the account signup and resend-email-confirmation links should
no longer point to the index.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-04-27 11:17:48 -07:00
Soulou
91deb591c8
[Documentation - API] Add missing 'signal' parameter for /containers/:id/kill endpoint
...
Docker-DCO-1.1-Signed-off-by: Leo Unbekandt <leo.unbekandt@appsdeck.eu > (github: Soulou)
2014-04-27 18:10:30 +01:00
Solomon Hykes
e83fc70d36
Freeze ./integration and explain where to contribute new tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-26 18:55:39 -07:00
Sven Dowideit
40882cc0b6
Merge pull request #5417 from jamtur01/readme3
...
Fixed double backtick to single backtick formatting issue in README
2014-04-27 11:48:52 +10:00
Sven Dowideit
91cd60efd8
Merge pull request #5416 from jamtur01/dockerize
...
Fixed Dockerise to Dockerize
2014-04-27 11:48:27 +10:00
James Turnbull
723d314f09
Replaced all double backticks in README with singles
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 10:12:09 -04:00
James Turnbull
df018bc801
Fixed Dockerise to Dockerize
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 09:48:07 -04:00
Sven Dowideit
3b279d0218
Merge pull request #5415 from jamtur01/readme2
...
Updated Docs README
2014-04-26 23:36:41 +10:00
James Turnbull
7744f63159
Updated Docs README
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 08:10:19 -04:00
Victor Marmol
f4055ee2a4
Adding a test for blkio stats.
...
Also adds a test utility we can use for other cgroup tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-26 07:29:13 +00:00
unclejack
44140f7909
Merge pull request #5411 from crosbymichael/lockdown
...
Update default restrictions for exec drivers
2014-04-26 03:27:56 +03:00
Solomon Hykes
4701f8ee60
Merge pull request #5365 from crosbymichael/job-status
...
Add exported status code from a job
2014-04-25 17:27:07 -07:00
Solomon Hykes
7e3624a498
engine: 'rengine' is a small command-line utility to debug remote engine
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
Solomon Hykes
b63b98ee27
engine.Sender and engine.Receiver support stdin
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
Solomon Hykes
3c1d5ca33e
Remote communication between engines using beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
Solomon Hykes
68d3e75750
engine: allow registering a "catchall" handler which receives all commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:16 -07:00
Solomon Hykes
9422451ac3
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:16 -07:00
Rohit Jnagal
8cdb720d26
Updated sample config to be usable. We should change the namespace
...
config to not need "value" later.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 21:10:23 +00:00
unclejack
077b7d0359
Merge pull request #5342 from danielnorberg/avoid-suicide
...
avoid suicide
2014-04-25 21:44:45 +03:00
James Turnbull
ed48608147
Merge pull request #5401 from SvenDowideit/docs-api-eg-formating
...
small api doc formatting fixup
2014-04-25 09:11:46 -04:00