Commit Graph
8053 Commits
Author SHA1 Message Date
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
Vincent Batts d47df97157 static_registry: update the test for the new struct
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 7790a77b6afeda6f223202288a89f4b431f033a0
Component: engine
2014-04-25 20:01:25 -04: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
Alexander Larsson 5874977460 devmapper: Store metadata in one file per device
This allows multiple instances of the backend in different containers
to access devices (although generally only one can modify/create them).

Any old metadata is converted on the first run.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 6d631968fa095734da5e3483c5d7c43fd5b87146
Component: engine
2014-04-25 15:21:56 +02: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
Alexander Larsson ce3bed9961 devmapper: Simplify thin pool device id allocation
Instead of globally keeping track of the free device ids we just
start from 0 each run and handle EEXIST error and try the next one.

This way we don't need any global state for the device ids, which
means we can read device metadata lazily. This is important for
multi-process use of the backend.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: f26203cf544db07ae64dffaa495e4217976c0786
Component: engine
2014-04-25 14:26:27 +02:00
Alexander Larsson 4d208f5ffd devmapper: Move error detection to devmapper.go
This moves the EBUSY detection to devmapper.go, and then returns
a real ErrBusy that deviceset uses.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 586a511cb5e47127a8fd173159fcd43e1b823fe7
Component: engine
2014-04-25 14:26:27 +02:00
Alexander Larsson d6ddff56bf devmapper: Maks createSnapDevice a function, not a method
No idea why this was a method. Maybe a cut and paste bug.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 8116b86e050b23a6b897d90a0d2f8d409e7ec04c
Component: engine
2014-04-25 14:26:27 +02: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
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 8bd8490f43 Update create with apparmor import
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 90678b31331de54598c7a6665c3e7a78bfe6ed63
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 b3bc92caaf Increment native driver version with these changes
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d6c3674349c09318e8d1fb3ce43dbabc15c97da
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 bdab73285c Add lxc support for restricting proc
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0779a8c3287fbf7ff1938df10897b551b839cbee
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
Michael Crosby f6b631e3c8 Merge pull request #5381 from rjnagal/master
Add support for cpu hardcapping to cgroups.
Upstream-commit: 4ed165210fd81ab7ee41cb7b67667b17949b084e
Component: engine
2014-04-24 10:04:17 -07:00
Guillaume J. Charmes 8b8d39c95a Merge pull request #5356 from alexlarsson/devmapper-no-mount-in-create
devicemapper: Don't mount in Create()
Upstream-commit: 56b779c32154327c2939a2e653fda3623b6f63b4
Component: engine
2014-04-24 08:19:59 -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
O.S.Tezer 9d22789050 Fix stray url from beta-docs warning (remove aws bucket URI)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 5e5230cb190b6d78cf27706da447d179b79b29b6
Component: engine
2014-04-24 16:29:12 +03:00
Sven Dowideit adad81a2c2 initial version of installation on ubuntu 14.04 LTS
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: da8f6ffdeb54a2d99a70deb4ffc58fdff76d5880
Component: engine
2014-04-24 22:59:59 +10:00
O.S. Tezer ca86832693 Merge pull request #5377 from SvenDowideit/fix-terms-links
Merged.
Upstream-commit: df20a0e7a356c719b67166931e1ab44ad6dff4e1
Component: engine
2014-04-24 15:42:10 +03:00
Sven Dowideit b6080f6f5b Looking into some broken links, I noticed that we don't need to use
relative paths, and also fixed some broken images.

There are still more todo - next PR I think :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ada86fc5b736d8b3209429c584384fd9974a148a
Component: engine
2014-04-24 22:20:04 +10:00
O.S.Tezer 772ac62a9b Docs auto-conversion fixes and MD marking and structure improvements.
- Remove redundant chars and all errors caused by RST->MD conversion.
   e.g. [/#, /\, \<, />, etc.]
 - Fix broken inter-document links
 - Fix outbound links no-longer active or changed
 - Fix lists
 - Fix code blocks
 - Correct apostrophes
 - Replace redundant inline note marks for code with code marks
 - Fix broken image links
 - Remove non-functional title links
 - Correct broken cross-docs links
 - Improve readability

Note: This PR does not try to fix/amend:

 - Grammatical errors
 - Lexical errors
 - Linguistic-logic errors etc.

It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Fix backtick issues

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c932667cd26f00bb64ddf0c1a7c7de3ac95aa4be
Component: engine
2014-04-24 22:19:32 +10:00
O.S.Tezer 7008cb66b2 Docs: Add docs new version files created by make docs to .gitignore
Files are:

 - docs/AWS_S3_BUCKET
 - docs/GIT_BRANCH
 - docs/VERSION

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

Update:

 - Remove unnecessary last blankline
Upstream-commit: d9f9021e9b8bc46481b4c2bb28786fd3f0b88b9c
Component: engine
2014-04-24 13:33:00 +03:00