Commit Graph

5132 Commits

Author SHA1 Message Date
b630bbc615 Merge pull request #21384 from Microsoft/10662-IOResourceControls
Add IO Resource Controls for Windows
Upstream-commit: a8c5ba75172686a2be2119a3b46c6acda02f0a36
Component: engine
2016-04-26 15:54:52 -07:00
21117de54d Small API formating fix.
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 204a52c689204a4d9506d500955673f7b5361d1d
Component: engine
2016-04-26 10:29:31 +00:00
87afb49f07 Add IO Resource Controls for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 8df2066341931d9b7ba552afa902e2ef12e5eed5
Component: engine
2016-04-25 13:07:29 -07:00
76284509d6 Merge pull request #22138 from wenchma/deprecated_since_before
Deprecated of docker ps since and before options for v1.12
Upstream-commit: 4e5ad97f5b2d9db237546e67de3049649c5ff5e8
Component: engine
2016-04-24 11:23:21 +02:00
95f6733644 Merge pull request #20639 from dnephin/split_client
Split the binary into two: client and daemon
Upstream-commit: 27f44b8af63d563f53c04b342cbafc3b8f27cb45
Component: engine
2016-04-23 14:14:20 -07:00
0f705c8304 Remove outdated Node.js example - include a link to the new guide later!
As recommended by @moxiegirl and squashed.

Signed-off-by: FWirtz <florian.wirtz08@gmail.com>
Upstream-commit: d9c0d67b51fc135b2dbf54a152105d124100eb5e
Component: engine
2016-04-23 14:10:24 +02:00
dcd6f9747a Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9e7651db4d464649bc32cf346fdee8c6900ebe0f
Component: engine
2016-04-22 11:26:01 -04:00
3e3ec58c45 Merge pull request #22196 from thaJeztah/add-mac-address-note
docs: add note about MAC addresses not being unique
Upstream-commit: 9b00817dc692458f9e27e375a870ecd0dcbd0b75
Component: engine
2016-04-22 11:26:17 +10:00
c289b3f431 Merge pull request #22193 from panyufeng920/master
optimise docs
Upstream-commit: 01dd64cd107b2a7d4c01be9074da155d65a79c57
Component: engine
2016-04-21 08:38:27 -07:00
0f8b8ed30c Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc
Fix daemon.json storage-opts settings example
Upstream-commit: 70746f4c38322ca14cb62321ce73b08b18422a14
Component: engine
2016-04-21 09:53:03 -04:00
5b79c087d8 The daemon.json storage-opts settings is actually a list.
Signed-off-by: Dimitry Andric <d.andric@activevideo.com>
Upstream-commit: e3eb24fc21fa6f6002eef081278333f9e5e16614
Component: engine
2016-04-21 10:56:35 +02:00
a659558dcf Fix the old exit status example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 896ebb1ca2a6ae23d7511678aaab1d4e32c54ff9
Component: engine
2016-04-21 03:24:10 +00:00
8c00bd5332 optimise docs
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
Upstream-commit: 9abf304c255cb3194b932e92f2b87bfabaab88c9
Component: engine
2016-04-21 09:34:28 +08:00
a63f858c5e docs: add note about MAC addresses not being unique
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 763aceeb733cdd927eb2de6232f0257267b6f71e
Component: engine
2016-04-20 19:24:39 +02:00
f7b3af0900 Merge pull request #21389 from chenchun/resize_direct_lvm
Resize direct lvm
Upstream-commit: f96d15d3c361a08ad892759d5e885625b0d48302
Component: engine
2016-04-20 06:33:37 -07:00
a1c0412063 docs: use tables for available plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 79351caec1b413c9da1080fceff49eb994323734
Component: engine
2016-04-20 13:45:31 +02:00
e790582111 Merge pull request #22179 from wenchma/fix_asa
Fix asa
Upstream-commit: 3cf4cad0821698cefaf852c9d4b7b65df314ab35
Component: engine
2016-04-20 12:44:29 +02:00
605211aab5 Fix asa
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 6d4e7b67be77e3f290d4048c3da5d0f6540f1704
Component: engine
2016-04-20 11:14:47 +08:00
7c4fbf51d2 Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: b21d90c28faaa9f906c4e3b2145ddf661a19e994
Component: engine
2016-04-20 10:49:51 +08:00
121a98a71e Merge pull request #22148 from thaJeztah/remove-old-api-versions
Remove API versions 1.17 and older from documentation
Upstream-commit: 4a8519ba29a0b1f1aa2f9e9ac6d991114d8b8253
Component: engine
2016-04-19 10:26:56 -07:00
4ebf703e54 Merge pull request #21495 from HackToday/addnetworkfilter
Add network label filter support
Upstream-commit: 75cc2c926b3296ed07af130a91ed2409f823ff70
Component: engine
2016-04-19 19:15:14 +02:00
f2f56b9e01 Add the NetApp Docker Volume Plugin to the documentation
Signed-off-by: Jared Hocutt <jaredh@netapp.com>
Upstream-commit: f310fd14a9a99362635198cd5b1517a053813c92
Component: engine
2016-04-19 11:30:39 -04:00
2052cabd5a Remove API versions 1.17 and older from documentation
Docker 1.5 and older is no longer supported by Docker Hub,
so there's not much need to document the API for those
versions.

Documentation is still available on GitHub, and through
the older versions of the documentation for those
that really need it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 68f9a45440c1d87316ec5106f942a8cae9113ca0
Component: engine
2016-04-19 14:39:14 +02:00
f5ac686743 Deprecated of docker ps since and before options for v1.12
Deprecated note https://github.com/docker/docker/blob/master/docs/deprecated.md#docker-ps-before-and-since-options

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 91b715706493059d39c9f8b1d01c9d80ce1799d9
Component: engine
2016-04-19 18:13:55 +08:00
888a7f4130 Docs: Container creation param descriptions not under HostConfig
This fix tries to fix issues mentioned in #22100 for incorrect
description of remote API's container creation params.

Several issues have been fixed:
1. CPU and memory related params (e.g., `MemorySwap`, `CpuShares`, etc.)
were incorrectly placed under the top level instead of under the HostConfig.
(v1.18-v1.24)
2. The param `Cpuset` has been deprecated but was never removed.
(v1.18-v1.24)
3. The param `PidsLimit` was not added even though the description
has been added.
(v1.23-v1.24)

This fix fixes #22100

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 332e3b545b0c0e825364c0f09315f82546c791f0
Component: engine
2016-04-18 21:15:33 -07:00
d32fb564d6 Merge pull request #22048 from thaJeztah/docs-update-api-for-labels
docs: update API for features added in 1.11
Upstream-commit: ac7e011ec90b110e62aafd3a1b2963634c9976a3
Component: engine
2016-04-18 18:21:38 +02:00
53859297b1 Merge pull request #22086 from aboch/doc
Clarify container external connectivity in multi-network scenario
Upstream-commit: e764e0215e11da40a1e2148efc9867be362bd2d4
Component: engine
2016-04-18 18:16:51 +02:00
27c9033293 doc: fix typo
Signed-off-by: yorkie <yorkiefixer@gmail.com>
Upstream-commit: d2c5bf23f16a98ca6f603f7fe2b5a31c70d4c8db
Component: engine
2016-04-18 23:42:33 +08:00
74a010ee39 Clarify container external connectivity in multi-network scenario
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c2e088e13488904a6747809a689eac5d72a4618e
Component: engine
2016-04-18 08:39:40 -07:00
1beaa5c119 Add network label filter support
This patch did following:

1) Make filter check logic same as `docker ps ` filters

Right now docker container logic work as following:
when same filter used like below:
 -f name=jack -f name=tom
it would get all containers name is jack or tom(it is or logic)

when different filter used like below:

 -f name=jack -f id=7d1
it would get all containers name is jack and id contains 7d1(it is and logic)

It would make sense in many user cases, but it did lack of compliate filter cases,
like "I want to get containers name is jack or id=7d1", it could work around use
(get id=7d1 containers' name and get name=jack containers, and then construct the
final containers, they could be done in user side use shell or rest API)

2) Fix one network filter bug which could include duplicate result
when use -f name=  -f id=, it would get duplicate results

3) Make id filter same as container id filter, which means match any string.
not use prefix match.

It is for consistent match logic

Closes: #21417

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: f812b55692f5d50d427684216ad6c806bac5a702
Component: engine
2016-04-18 00:38:48 +00:00
3fe83c23f0 docs: update API for features added in 1.11
Docker 1.11 added a feature to set labels on volumes,
networks and images (during build), but these changes
were not documented in the API documentation.

This adds the new features to the documentation.

Also fixes some minor formatting, and options that
were not used in the examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ba353f37870fdeb8b875a79e1aec54dc3d1aedc4
Component: engine
2016-04-16 02:27:52 +02:00
e5a1aebe66 docs: remove unused "registry" parameter
The "registry" query-param was in added 10c0e990371e065d4fc1c9b680f03a46e5bacc5e,
and removed in docker 0.5.0 via 66a9d06d9fa7a382c6852cf047e1448e0d3e1782.

Aparently, it was never removed from the documentation,
and included in all versions of the API docs.

This removes it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e035a86c1d981d5e2ade303a9152ee36125a4cb9
Component: engine
2016-04-16 02:09:58 +02:00
0358d67fc6 Fix incorrect docs in remote API for the option of SecurityOpt
This fix tries to fix the issue in remote API docs for v1.15 (Docker 1.3.x)
and v1.16 (Docker 1.4.x) where `SecurityOpts` was used but the actual field
should be `SecurityOpt`.

This `SecurityOpt` field is verified through the source code in
v1.3.0 and v1.4.0:
https://github.com/docker/docker/blob/v1.3.0/runconfig/config.go#L35
https://github.com/docker/docker/blob/v1.4.0/runconfig/hostconfig.go#L98

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f3f981624bc9329740e9a1c52e71471ca38d8171
Component: engine
2016-04-15 11:08:15 -07:00
23c1fd9d95 Merge pull request #21006 from cpuguy83/volume_inspect_meta
Allow volume drivers to provide a `Status` field
Upstream-commit: e40e5b97c1ad540aa0be568467546f27932ef3a5
Component: engine
2016-04-15 18:53:39 +02:00
ed92db4f93 Allow volume drivers to provide a Status field
The `Status` field is a `map[string]interface{}` which allows the driver to pass
back low-level details about the underlying volume.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 36a1c56cf555f8fe9ceabeebb8fc956e05863fc7
Component: engine
2016-04-15 10:56:38 -04:00
a713f0b76d Fix security documentation, XSS -> CSRF
Signed-off-by: Thomas Grainger <tagrain@gmail.com>
Upstream-commit: ea8f9c972393e0929e643190573412410bf39c6a
Component: engine
2016-04-15 11:29:37 +01:00
4e9b36b9f3 Merge pull request #20924 from Microsoft/10662-CPUResourceControls
Add CPU count and maximum resource controls for Windows
Upstream-commit: 172ca1ca8c4d5157789feb97a6424104b81a3479
Component: engine
2016-04-15 08:14:59 +02:00
b6c2e57eab Merge pull request #21172 from yongtang/20909-seccomp-in-docker-info
Show "seccomp" in docker info (#20909).
Upstream-commit: bc0c8828e9afc32f1660a1f679ed523376c7d3d2
Component: engine
2016-04-15 01:24:54 +02:00
22a06166b3 Add CPU count and maximum resource controls for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ea8c690886970b2929d52d8b61dcfb8becc24db9
Component: engine
2016-04-14 15:40:25 -07:00
ffa58e84f3 Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-gods
Add example to apparmor docs
Upstream-commit: 1a87a2105321e378ddfe0636869e4ee796174d3e
Component: engine
2016-04-14 21:48:02 +02:00
3b7a52e933 Add example to apparmor docs
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Upstream-commit: 80d63e2e112c75b1cc492ce52bdc0c61ef3c234c
Component: engine
2016-04-14 10:59:47 -07:00
06666cda9a Move volume filters to API 1.24 docs
This feature was added after the 1.11 code-freeze,
so will be part of the 1.12 release. Moving it to the
right API version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8ef76f779d6ea59cb1a8c6fde52e4d719a8c073a
Component: engine
2016-04-14 17:12:28 +02:00
4e4a914f17 closes #11703 closes #11560
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 297d6c04a31f39ff24fcebad8d82c43e0bcf6900
Component: engine
2016-04-14 15:21:07 +02:00
2a0b94972b Merge pull request #19265 from rhatdan/netsysctl
Add support for setting sysctls
Upstream-commit: 988508a2b5aa18c04fd3db143b4e4f5f207ea15e
Component: engine
2016-04-13 18:36:30 +02:00
977c2f6a60 Fixes #21701 devicemapper docs
Copy edit the content
Updates to existing material
Adding mbentley's comments
Updating with last minute comments
Update with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 783ebebff40ebdae27dc72b4c8c5151a01220a87
Component: engine
2016-04-13 08:02:16 -07:00
df51bb2466 Merge pull request #21994 from thaJeztah/update-binary-installation
docs: update installation from binaries for 1.11
Upstream-commit: 1687f77db2892a3221cbafd46dc11e07ddcec438
Component: engine
2016-04-13 09:26:52 -04:00
35dbb56580 docs: update installation from binaries for 1.11
Binaries are now distributed as a '.tgz' or '.zip'
archive, and contain multiple binaries for Linux.

This updates the instructions for 1.11.

Also mention that the Windows 64-bit binary
actually can be used as a daemon. Given that
this is still in beta, no instructions were
added for *running* a daemon on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f5336c737086a4c1807bb2b6ab57116b5ed9d769
Component: engine
2016-04-13 15:26:03 +02:00
9a1f7c0972 Merge pull request #21885 from triccardi-systran/20612-improve-build-cache-miss-documentation
Improve build cache miss doc for `ARG` and `RUN`
Upstream-commit: edfe4e9fba89d0b8458e7e76132da2440c29ccbd
Component: engine
2016-04-13 15:23:14 +02:00
44c73694c8 Improve build cache miss doc for ARG and RUN
The documentation already says the cache miss happens only at `ARG`
variable usage, not declaration, but there is a very common implicit
usage: `RUN`, which this commit documents even more, improving on #21790.

Also, use `definition` instead of `declaration`: it's the same thing, and
`definition` is already used in this documentation, contrary to
`declaration`.

Also, distinguish between "instructions" and "variables defined by `ARG`
instructions".

Signed-off-by: Thomas Riccardi <riccardi@systran.fr>
Upstream-commit: 82f5ef2d2562f9e742eb694dc4b0a1f768a4f0de
Component: engine
2016-04-13 15:02:09 +02:00
8becc1526b Update /containers/create remote API docs
- Show how to pass the networking config in POST containers/create body

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 30859c34569b900d3d798ad55f48f3d4fd7dc32c
Component: engine
2016-04-12 13:41:13 -07:00