Commit Graph

20395 Commits

Author SHA1 Message Date
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
3dedcf3278 update message
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 68d8d9a62d6199d0e285f8ec07b1a3cbdada8ac8
Component: engine
2014-04-28 19:03:31 +00:00
7a8a259b48 docker rmi -f works with stopped containers + revamped error messages
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 78421b376897c589a3c7a80a5b94fc3dd74e2741
Component: engine
2014-04-28 19:02:04 +00:00
1f9a09d037 Docs fix: correct /commit info
Correct documentation for POST /commit to reflect that the container's
configuration is supplied in the request body, and not as a query
parameter.

Also correct a small typo in the example JSON for create container.

Docker-DCO-1.1-Signed-off-by: Andy Goldstein <agoldste@redhat.com> (github: ncdc)
Upstream-commit: bba1dd046dd39405877c9f0b53502e68dddf36b1
Component: engine
2014-04-28 13:38:58 -04: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
273a5bea05 Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
Docs' BG was original "#fff" and blocks such as code blocks or
warning-notes blocks were coloured in #F2F2F2.

In order to make it easier to read everything, the BG colour was
changed to #fff. However, the switch missed to convert other blocks'
BG colour.

This commit aims to re-introduce the correct contrast by changing the
BG colour of warning/notes block to #fff.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: abf3baf4ebfb8128ed4090165c65de0e3f4be278
Component: engine
2014-04-28 19:02:50 +03:00
9a09ab5b2e Docs/CSS: Amend code block rendering.
This commit aims to improve the rendering of code blocks by
reducing the padding, matching the font-size with the rest of the
documentation text and finally, by changing the background colour
back to white from its current gray-ish state which matches the
background colour and making it really hard to spot the code.

Note: The BG colouring issue is due to converting the main BG
to gray whilst missing to change parts that where gray to white, i.e.,
not making the complete switch.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: f334dbe82de06f9c71b850da4165076bb3cf8f4b
Component: engine
2014-04-28 18:58:15 +03:00
61af6f631a Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
So far it has been mostly my duty to create and maintain docs' design/theme.

This commit adds myself to the list of maintainers by modifying
the MAINTAINERS file under the docs/theme directory.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 442b70c65a48d4a0d0e543d95fb0d0085c97fd67
Component: engine
2014-04-28 18:36:40 +03:00
498588df13 Docs/CSS fix: Aallow viewport expand to user's preference
This commit removes the "max-width" property of DOM "containers";
Thus letting the viewport to expand to fill the available space.

This commit aims to bring pleasure to Docker docs' readers' eyes,
And to make them happy by letting them profit more from their large
monitors. (or use more efficiently their smaller ones).

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: b6699111dbf4417dc1871b8e9217e842bcd14295
Component: engine
2014-04-28 18:30:31 +03: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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