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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c5be0fd91f
Merge pull request #5374 from shykes/beam-engine
...
Remote communication between engines using beam
Upstream-commit: 62f4c884439044475eeaf7a18cd8a260df08a880
Component: engine
2014-04-27 14:10:59 -07:00
a13b1d9286
Merge pull request #5425 from jlhawn/io-auth-accounts-api-docs
...
Merged.
Upstream-commit: 44c69c1d87d4ebca1c453d6babce1aeebcb7e5ed
Component: engine
2014-04-27 21:40:03 +03:00
a11d66ea07
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)
Upstream-commit: c6060a3b25b94ae4738ac27bbf62cbb914af7ced
Component: engine
2014-04-27 11:17:48 -07:00
268409eaa5
[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)
Upstream-commit: 91deb591c8a52a974612b4c6885d989251f819bd
Component: engine
2014-04-27 18:10:30 +01:00
62e9a76b63
Freeze ./integration and explain where to contribute new tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: e83fc70d362bf0035811bbcc5566020c6cc9893f
Component: engine
2014-04-26 18:55:39 -07:00
ef52adb314
Merge pull request #5417 from jamtur01/readme3
...
Fixed double backtick to single backtick formatting issue in README
Upstream-commit: 40882cc0b676d00b52e43b9a42d67381f587f80d
Component: engine
2014-04-27 11:48:52 +10:00
f608a34704
Merge pull request #5416 from jamtur01/dockerize
...
Fixed Dockerise to Dockerize
Upstream-commit: 91cd60efd8ed646b9cbd114e9e92e7df4fb8b15c
Component: engine
2014-04-27 11:48:27 +10:00
fdb0b2b56e
Replaced all double backticks in README with singles
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 723d314f097fe7b1e15f27c1d6f05794b6c5f411
Component: engine
2014-04-26 10:12:09 -04:00
97fe9aac5f
Fixed Dockerise to Dockerize
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: df018bc8012ad4181ac16e1329c970fe213f1f87
Component: engine
2014-04-26 09:48:07 -04:00
c9e305bddc
Merge pull request #5415 from jamtur01/readme2
...
Updated Docs README
Upstream-commit: 3b279d02184266eace66777b5e48be740c24d035
Component: engine
2014-04-26 23:36:41 +10:00
7eb9afe4a1
Updated Docs README
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 7744f63159cee9cfa5d9e9307e5c29a4f589837f
Component: engine
2014-04-26 08:10:19 -04:00
2e76f7d9a4
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)
Upstream-commit: f4055ee2a467458d4848ad6f8e79fc0162d377f9
Component: engine
2014-04-26 07:29:13 +00:00
f2b5fc4e3c
Merge pull request #5411 from crosbymichael/lockdown
...
Update default restrictions for exec drivers
Upstream-commit: 44140f7909ac65206d300fa9a39ae06cc27d1847
Component: engine
2014-04-26 03:27:56 +03:00
c0ccb32841
Merge pull request #5365 from crosbymichael/job-status
...
Add exported status code from a job
Upstream-commit: 4701f8ee60db9af11f35d24f8d4b163490722d60
Component: engine
2014-04-25 17:27:07 -07:00
e77e02d78a
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)
Upstream-commit: 7e3624a498b8b96a4e8a0f1d59fc2c50bf48efb3
Component: engine
2014-04-25 17:23:47 -07:00
bceccfa5cf
engine.Sender and engine.Receiver support stdin
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: b63b98ee2766321e2ca6f3b159c2bfb303870105
Component: engine
2014-04-25 17:23:47 -07:00
2e9c0c6ca2
Remote communication between engines using beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 3c1d5ca33ecbd644d4e8d864ff59b389f4a4a555
Component: engine
2014-04-25 17:23:47 -07:00
35fee9d895
engine: allow registering a "catchall" handler which receives all commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 68d3e757503fab422fc96a00d511336a3fdfd619
Component: engine
2014-04-25 17:23:16 -07:00
8fdb34e01b
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)
Upstream-commit: 9422451ac3f541a17daba0d5f6dc8b40a6edc9e9
Component: engine
2014-04-25 17:23:16 -07:00
c0a79693ae
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)
Upstream-commit: 8cdb720d26197e448587a21894069ee8a20e8aa0
Component: engine
2014-04-25 21:10:23 +00:00
ef140af848
Merge pull request #5342 from danielnorberg/avoid-suicide
...
avoid suicide
Upstream-commit: 077b7d0359ca9d1a9ee38a5342ad07929692c54a
Component: engine
2014-04-25 21:44:45 +03:00
10d3a0b394
Merge pull request #5401 from SvenDowideit/docs-api-eg-formating
...
small api doc formatting fixup
Upstream-commit: ed486081470b7f42c0113b406ee11d7310bd8bbe
Component: engine
2014-04-25 09:11:46 -04:00
72e7e8f048
small api doc formatting fixup
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: c7bd1f4e648c6615eafebbfcaeb1c30020fc0aba
Component: engine
2014-04-25 20:36:31 +10:00
ecc3df07ca
Updated sample config and README to match the default template for
...
native execdriver.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: 24f978094dc5c9eae0ca60001b65256b2b30f2c8
Component: engine
2014-04-25 06:02:30 +00:00
6e7ac095e3
Add memory usage and max usage stats.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
Upstream-commit: ad924959a9879af7477fa23c19d570882c1f378f
Component: engine
2014-04-25 02:51:28 +00:00
4c71977a35
Improved README formatting.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
Upstream-commit: 580c2620e7b92d9aee7c1cd033ca987dda161cf1
Component: engine
2014-04-25 01:23:48 +00:00
