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

409 Commits

Author SHA1 Message Date
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
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
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
Solomon Hykes
df4d4ec486 beam/examples/beamsh: rename 'log' to 'logger' to avoid conflict with stdout/stderr 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: b97375fc29a88f896e14f45a34c263a4948c9ad9
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
05ff9d4c14 beam/examples/beamsh: 'prompt' asks the user for a value and sends it. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a2b88b4915acf7b1c1a165dd9193f416e5b99e3c
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
efaa77908b beam/examples/beamsh: commands are messages. 
Commands in the pipeline should either implement or pass-through command messages.

This amounts to a proof-of-concept implementation of the "pipeline"
design of Docker plugins.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ed62ca5b2f673fde54c2ffc5edaf0e5bcbd1b721
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
4c6e97a76f beam/examples/beamsh: cosmetic fix in Fatalf 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2f4b8b7e8dbdc1861ee83b63d92ab0921045861f
Component: engine
 2014-04-22 15:50:22 -07:00
Solomon Hykes
dd8f545bb2 beam: replace SendPair() with the simpler SendConn() 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4f92ffb50036f313a51020e1bfdcad7b10db65fb
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
d1f6c39cc9 beam/examples/beamsh: miniserver.ds demo 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 5833e7888725dcb7d0bfd3f23087deed73a75328
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
4b5530e072 beam: improve the API with Sender/Receiver interfaces and utilities: Copy/SendPipe/SendPair 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 70d32621615506b6622380ed6021f63be67e6e23
Component: engine
 2014-04-22 15:50:21 -07:00
Alexander Larsson
3822f04f53 beam: Make extracted Fds CloseOnExec 
Grab forklock to make sure no forks accidentally inherit the new fds
before they are made CLOEXEC There is a slight race condition between
ReadMsgUnix returns and when we grap the lock, so this is not
perfect. Unfortunately There is no way to pass MSG_CMSG_CLOEXEC to
recvmsg() nor any way to implement non-blocking i/o in go, so this is
hard to fix.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: b0228d94beeeb331f6ac58b289eba4982a42c5d4
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
1695eb64ac beam/examples/beamsh: add a few example dockerscripts 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 207e604bad1bf5d69c139cb17568cfc473a391ba
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
dd65dea1c6 beam/examples/beamsh: simplify code by using sendWPipe utility 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 29ddf2be1e9b9349865e3d0f34b1d4fc0b960ee3
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
aed648b82b beam/examples/beamsh: move code around for readability 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1dc449e11dfaf9b376b953322b4bab19e88f7d94
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
609fa308ff beam/examples/beamsh: 'exec' adds 'fromcmd' field to its output 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3a2b31a30b49f02f6043be5790fd2a123c2c5eae
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
ab1a9fa4e1 beam/examples/beamsh: simple 'log' command tees streams to a local directory 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 7534f7a34b2f0d5eac5e59c1a686adc6f4410d26
Component: engine
 2014-04-22 15:50:21 -07:00
Solomon Hykes
0fd013996b beam/examples/beamsh: 'render' and 'beamsh -x' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4f5b94d3690e3ccdcc23b68d9635dfa37b6dd0e4
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
75bca8866b beam/examples/beamsh: run commands in an implicit context of pre-loaded 'plugins' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4ebe7aab91b67048ea0d2bbec13bfb1d79787f11
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
1875fe5b4e beam/examples/beamsh: convenience commands 'devnull', 'echo' and 'stdio' 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: cd85af06fe693d849766348e505607f3bd4ff3fc
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
6679196850 beam/examples/beamsh: 'emit' supports key=value syntax to compose arbitrary objects 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6d9cdbf24f1f99dd42788afcadc300128175f42f
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
31e10ad323 dockerscript: '=' is not a special character 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2b81fb8424eb4ba8c815c856075509d686c383a0
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
e69a2729d2 beam/examples/beamsh: support for background commands with '&' terminator 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6e0a156d9086300a34b0e1f441dd5150dde57be1
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
e8bf776d4f beam/data: Message.Parse creates a message from shell-style 'key=value' arguments 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 08686f1d2108bbe93d02e870abe8b944b1fe022b
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
1c72cca268 dockerscript: support '#' line comments 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ffe19414b1cc02daeb0cad4b7310ab1e96976ecf
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
9b009b457a beam/examples/beamsh: scripts can be passed as filenames 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e1c8dbba97212381874c297ba07270436ea595cc
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
f1d3513c36 beam/examples/beamsh: remote communication over beam (experimental). 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 222fc87ade3ed83623a3dae867f50d193b48b2a9
Component: engine
 2014-04-22 15:50:20 -07:00
Solomon Hykes
ea79e30c93 beam/examples/beamsh: 'in' chdirs to a directory. 'pass' does simple passthrough 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 371f6fc63d864711ee546220116f31ddb151fcce
Component: engine
 2014-04-22 15:50:19 -07:00
Solomon Hykes
70bbf6d2b3 beam/examples/beamsh: 'beamsend' command serializes all messages and sends them over a network connection 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6d5c75a2242d14fda250759371fdedbcd519654a
Component: engine
 2014-04-22 15:50:19 -07:00
Solomon Hykes
85628de2fe beam/examples/beamsh: 'exec' command correctly closes stdout and stderr when the process exists 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 5ddf67385164f76a2dbe1ed30442dd99c7911827
Component: engine
 2014-04-22 15:50:19 -07:00