p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,784 Commits 2 Branches 295 Tags
d43500e59be063d4c8dc732815efe8cbaa413f45
Commit Graph

435 Commits

Author SHA1 Message Date
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
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
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
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
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
Victor Marmol
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
unclejack
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
Rohit Jnagal
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
Rohit Jnagal
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
Victor Marmol
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
Rohit Jnagal
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
Rohit Jnagal
d8ab1ab869 Add enabled option to namespaces and capabilities spec in 
container.json. Although we don't yet check for enabled everywhere.

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 569b23413502713342b605abaf917f664d206a4b
Component: engine
 2014-04-25 01:10:11 +00:00
Rohit Jnagal
04161acf75 Fix typos in nsinit logs. 
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 0aacca3ae6fa7d46a3e2c4e60e71f67c9a4c64e5
Component: engine
 2014-04-25 00:20:14 +00:00
Rohit Jnagal
df00ac1430 Fix container.json sample to be loadable by nsinit. 
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 14b2a9de874ab80aaaa942b7b8a226bb56dfcd7f
Component: engine
 2014-04-25 00:17:45 +00:00
Victor Marmol
69a18c6508 Separating cgroup Memory and MemoryReservation. 
This will allow for these to be set independently. Keep the current Docker behavior where Memory and MemoryReservation are set to the value of Memory.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: f188b9f623e23ee624aca8654bf00f49ee3bae29
Component: engine
 2014-04-24 11:09:38 -07:00
Michael Crosby
4269c4b6a6 Ignore isnot exists errors for proc paths 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d5c9f61ecc1c8167322a8cc3b41f29a35c80b9b8
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
72d2138bac Update init for new apparmor import path 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fa5cabf9fe9e257d64638043ca2fd08a7bf96cb3
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
bccf8f7f86 Update container.json and readme 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d31aeb911fc94baa88f975110c5ccd45d041acb
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
8ab9384720 Move capabilities into security pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a0b3610664c2269fd5932f294adae72e6e54020
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
28044eef7b Move mounts into types.go 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 156987c118f6f4067794e09e90aabeee0002d05c
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
c05360ff3b Move rest of console functions to pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a949d39f195e7b87288b10b0ef31843e6a3d8eb0
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
0099e7d236 Refactor mounts into pkg to make changes easier 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 05b611574f85c7ff7d479e04e01ac2b57b233591
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
0cfbbc14e7 Move console into its own package 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: de3d51b0a824e31d7e245aed958d53f436456699
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
a750afc31e Mount over dev and only copy allowed nodes in 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5ba1242bdc309352c2b0b9a1ef9e07fe835e4857
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
20ba5d97da No not mount sysfs by default for non privilged containers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 81e5026a6afb282589704fd5f6bcac9ed50108ea
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
9da373d6b1 Add restrictions to proc in libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 60a90970bc4add3547064004f08c19ab5027141b
Component: engine
 2014-04-24 10:35:19 -07:00
Michael Crosby
4b4b1b7313 Move apparmor into security sub dir 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d26ea78e42ebf18219b88e01c6252f30aa764aa2
Component: engine
 2014-04-24 10:35:19 -07:00
Rohit Jnagal
4a39371d62 Add support for cpu hardcapping to cgroups. 
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Upstream-commit: 264dc8a46bb7f7679439d0a2c41c79a09642acab
Component: engine
 2014-04-24 14:43:02 +00:00
Solomon Hykes
fba1cacd59 Fix Go formatting in beam and dockerscript 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: bf51f36d8f07d0c53f7b7b3c21ae372f7ca3be33
Component: engine
 2014-04-22 16:16:29 -07:00
Solomon Hykes
bd9345fd64 pkg/dockerscript: add MAINTAINERS file 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0bf2109121c3b6e12f781acc14016af451c5cd3d
Component: engine
 2014-04-22 15:50:24 -07:00
Solomon Hykes
bed3b0cf53 beam/examples/beamsh: 'chdir' changes the current directory 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: bc6303f15d9ac4f2f281bbf4e4d76f7517e10117
Component: engine
 2014-04-22 15:50:24 -07:00
Solomon Hykes
0d5fc83e93 beam/examples/beamsh: 'exec' can communicate with its child via beam. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6ce4d2c8424e029237b4ad0c615a4ff6204a1064
Component: engine
 2014-04-22 15:50:24 -07:00
Solomon Hykes
81a0f67a86 beam/examples/beamsh: use beam.Router to simplify 'multiprint' and fix job passthrough 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 271ba1804349217d8cc22cfdd412a1741dbbcfea
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
b636123fc3 beam: new routing functions Route.KeyEquals, Route.KeyIncludes, Route.NoKey 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0d08d36bf576babd74f21b83ccde019acde4d9c7
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
262cbf977c beam/examples/beamsh: use beam.Router to simplify 'trace' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 30424f4e3a40ec21ac25e5c3f9ef45c3109c9f06
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
752ad4f822 beam/examples/beamsh: move builtins to a separate file for readability 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: d3df4b5baf0d3707dd8bbf700c5836dfdfac8752
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
6bbf98f17b beam/examples/beamsh: simplify commands by always creating and sending stdout and stderr for them 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0822d67b2dc05dc2500e3b898dc3604be47fcd84
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
d0489babdf beam/examples/beamsh: use beam.Router to simplify 'logger' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 63fd2ec0f7ec091912435cedc081b132e66ae658
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
679c521f8a beam/examples/beamsh: use beam.Router to simplify the 'stdio' command 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 9206b18818db988621f60cbf869eb20acd1a49e9
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
2a384a9a0b beam: Router can route beam messages with a convenient set of rules and handlers 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 8f5435e80c3dbaa27429bbb7cadf2c735caa76de
Component: engine
 2014-04-22 15:50:23 -07:00
Solomon Hykes
66816b58ac beam/examples/beamsh: move example scripts to scripts/ 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 40b4f86eab7b5bf7ca7d85eb8cc7b715fd03feab
Component: engine
 2014-04-22 15:50:22 -07:00
Alexander Larsson
2ef34ed7cf beam: Fix double close of fds in SendUnix 
Instead of calling syscall.Close() on the fds in sendUnix() we call
Close() on the *os.File in Send(). Otherwise the fd will be closed, but
the *os.File will continue to live, and when it is finalized the
fd will be closed (which by then may be reused and can be anything).

This also adds a note to Send() the the file is closed.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 1fb0bf1b3b7ba2f5188bb58ef8d6991173e6b0f2
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
7ceb7e67ea beam: more unit tests 
This adds testing to SendConn.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a88d8d678b4f168885a65f8bb13720f282725355
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
2b6efd6fe0 beam/examples/beamsh: add scripts to reproduce various bugs 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 06df94d55b6a1ec10faf4672ebe7fcaf7fb62ab7
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
a7e559b7d2 beam/examples/beamsh: fix 'print' to be pass-through 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: d0ca66dded29c3e5e2f78d99e9cc9205484c3b5f
Component: engine
 2014-04-22 15:50:22 -07:00