toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,773 Commits 3 Branches 295 Tags
d77803d8193a29e93caad30306abdb9411afeacb
Commit Graph
7773 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
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
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
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
Solomon Hykes 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
O.S. Tezer 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
Josh Hawn 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
Soulou 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
Solomon Hykes 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
Sven Dowideit 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
Sven Dowideit 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
James Turnbull 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
James Turnbull 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
Sven Dowideit c9e305bddc Merge pull request #5415 from jamtur01/readme2 
Updated Docs README
Upstream-commit: 3b279d02184266eace66777b5e48be740c24d035
Component: engine
 2014-04-26 23:36:41 +10:00
James Turnbull 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
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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
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
unclejack ef140af848 Merge pull request #5342 from danielnorberg/avoid-suicide 
avoid suicide
Upstream-commit: 077b7d0359ca9d1a9ee38a5342ad07929692c54a
Component: engine
 2014-04-25 21:44:45 +03:00
James Turnbull 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
Sven Dowideit 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
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
James Turnbull 490e1d25d6 Merge pull request #5355 from SvenDowideit/doc-ubuntu-14-04-lts 
initial version of installation on ubuntu 14.04 LTS
Upstream-commit: a368c0dd50163fbdc2c9dc72abe2160c9111e64f
Component: engine
 2014-04-24 20:06:08 -04:00
Sven Dowideit 27e0450bda Merge pull request #5371 from ostezer/docs-add-docs-versioning-files-to-gitignore 
Docs: Add docs new version files created by `make docs` to .gitignore
Upstream-commit: b3bea07d561d4efcdb5a47087eaf3ec1cd906fdc
Component: engine
 2014-04-25 09:08:43 +10:00
Sven Dowideit 75bef1c9a4 Merge pull request #5372 from SvenDowideit/docs-tweaks-to-socket-options 
Docs tweaks to socket options
Upstream-commit: 1083b6d2ecc3dd5b71d285954aa6d101a5847db3
Component: engine
 2014-04-25 09:08:22 +10:00
Sven Dowideit e46a516450 Merge pull request #5378 from ostezer/docs-fix-stray-url-from-warning 
Fix stray url from beta-docs warning (remove aws bucket URI)
Upstream-commit: 7f64210e9eb463f217377621617c28ba1be87693
Component: engine
 2014-04-25 09:07:58 +10:00
Guillaume J. Charmes fc27b99e17 Merge pull request #5373 from vmarmol/master 
Separating cgroup Memory and MemoryReservation.
Upstream-commit: 85540f6aa0c742c1623025b1fb235d7fd29cd9c7
Component: engine
 2014-04-24 14:28:40 -07:00
Michael Crosby d81d54cd3e Merge pull request #5335 from alexlarsson/remove-ghost 
container: Remove Ghost state
Upstream-commit: 8af84c5e23cff006d7fe9c730613a618174f418c
Component: engine
 2014-04-24 11:55:05 -07: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