Commit Graph

5122 Commits

Author SHA1 Message Date
David Calavera 01dd64cd10 Merge pull request #22193 from panyufeng920/master
optimise docs
2016-04-21 08:38:27 -07:00
Brian Goff 70746f4c38 Merge pull request #22220 from dandric-activevideo/fix-storage-opts-doc
Fix daemon.json storage-opts settings example
2016-04-21 09:53:03 -04:00
Dimitry Andric e3eb24fc21 The daemon.json storage-opts settings is actually a list.
Signed-off-by: Dimitry Andric <d.andric@activevideo.com>
2016-04-21 10:56:35 +02:00
Kai Qiang Wu(Kennan) 896ebb1ca2 Fix the old exit status example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-21 03:24:10 +00:00
搏通 9abf304c25 optimise docs
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
2016-04-21 09:34:28 +08:00
moxiegirl f96d15d3c3 Merge pull request #21389 from chenchun/resize_direct_lvm
Resize direct lvm
2016-04-20 06:33:37 -07:00
Sebastiaan van Stijn 79351caec1
docs: use tables for available plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-20 13:45:31 +02:00
Sebastiaan van Stijn 3cf4cad082 Merge pull request #22179 from wenchma/fix_asa
Fix asa
2016-04-20 12:44:29 +02:00
Wen Cheng Ma 6d4e7b67be Fix asa
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-04-20 11:14:47 +08:00
Chun Chen b21d90c28f Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-04-20 10:49:51 +08:00
moxiegirl 4a8519ba29 Merge pull request #22148 from thaJeztah/remove-old-api-versions
Remove API versions 1.17 and older from documentation
2016-04-19 10:26:56 -07:00
Vincent Demeester 75cc2c926b Merge pull request #21495 from HackToday/addnetworkfilter
Add network label filter support
2016-04-19 19:15:14 +02:00
Jared Hocutt f310fd14a9
Add the NetApp Docker Volume Plugin to the documentation
Signed-off-by: Jared Hocutt <jaredh@netapp.com>
2016-04-19 11:30:39 -04:00
Sebastiaan van Stijn 68f9a45440
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>
2016-04-19 14:39:14 +02:00
Yong Tang 332e3b545b 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>
2016-04-18 21:15:33 -07:00
Vincent Demeester ac7e011ec9 Merge pull request #22048 from thaJeztah/docs-update-api-for-labels
docs: update API for features added in 1.11
2016-04-18 18:21:38 +02:00
Vincent Demeester e764e0215e Merge pull request #22086 from aboch/doc
Clarify container external connectivity in multi-network scenario
2016-04-18 18:16:51 +02:00
yorkie d2c5bf23f1 doc: fix typo
Signed-off-by: yorkie <yorkiefixer@gmail.com>
2016-04-18 23:42:33 +08:00
Alessandro Boch c2e088e134 Clarify container external connectivity in multi-network scenario
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-04-18 08:39:40 -07:00
Kai Qiang Wu(Kennan) f812b55692 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>
2016-04-18 00:38:48 +00:00
Sebastiaan van Stijn ba353f3787 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>
2016-04-16 02:27:52 +02:00
Sebastiaan van Stijn e035a86c1d
docs: remove unused "registry" parameter
The "registry" query-param was in added 10c0e99037,
and removed in docker 0.5.0 via 66a9d06d9f.

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>
2016-04-16 02:09:58 +02:00
Yong Tang f3f981624b 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>
2016-04-15 11:08:15 -07:00
Vincent Demeester e40e5b97c1 Merge pull request #21006 from cpuguy83/volume_inspect_meta
Allow volume drivers to provide a `Status` field
2016-04-15 18:53:39 +02:00
Brian Goff 36a1c56cf5 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>
2016-04-15 10:56:38 -04:00
Thomas Grainger ea8f9c9723
Fix security documentation, XSS -> CSRF
Signed-off-by: Thomas Grainger <tagrain@gmail.com>
2016-04-15 11:29:37 +01:00
Vincent Demeester 172ca1ca8c Merge pull request #20924 from Microsoft/10662-CPUResourceControls
Add CPU count and maximum resource controls for Windows
2016-04-15 08:14:59 +02:00
Vincent Demeester bc0c8828e9 Merge pull request #21172 from yongtang/20909-seccomp-in-docker-info
Show "seccomp" in docker info (#20909).
2016-04-15 01:24:54 +02:00
Darren Stahl ea8c690886 Add CPU count and maximum resource controls for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-04-14 15:40:25 -07:00
Sebastiaan van Stijn 1a87a21053 Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-gods
Add example to apparmor docs
2016-04-14 21:48:02 +02:00
Jess Frazelle 80d63e2e11
Add example to apparmor docs
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
2016-04-14 10:59:47 -07:00
Sebastiaan van Stijn 8ef76f779d
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>
2016-04-14 17:12:28 +02:00
Robin Naundorf 297d6c04a3 closes #11703 closes #11560
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
2016-04-14 15:21:07 +02:00
Vincent Demeester 988508a2b5 Merge pull request #19265 from rhatdan/netsysctl
Add support for setting sysctls
2016-04-13 18:36:30 +02:00
Mary Anthony 783ebebff4 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>
2016-04-13 08:02:16 -07:00
Tibor Vass 1687f77db2 Merge pull request #21994 from thaJeztah/update-binary-installation
docs: update installation from binaries for 1.11
2016-04-13 09:26:52 -04:00
Sebastiaan van Stijn f5336c7370
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>
2016-04-13 15:26:03 +02:00
Vincent Demeester edfe4e9fba Merge pull request #21885 from triccardi-systran/20612-improve-build-cache-miss-documentation
Improve build cache miss doc for `ARG` and `RUN`
2016-04-13 15:23:14 +02:00
Thomas Riccardi 82f5ef2d25 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>
2016-04-13 15:02:09 +02:00
Alessandro Boch 30859c3456 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>
2016-04-12 13:41:13 -07:00
Dan Walsh 9caf7aeefd Add support for setting sysctls
This patch will allow users to specify namespace specific "kernel parameters"
for running inside of a container.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-04-12 13:37:31 -04:00
Mihai Borobocea a609c2c48b docs: fix grammar typo in 'Network containers'
Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
2016-04-10 17:22:02 +03:00
Vincent Demeester f9386538ec Merge pull request #21724 from flyinprogrammer/syslog-opts-env-labels
enable syslog logger to have access to env and labels
2016-04-10 10:58:25 +02:00
Yong Tang f919a26a9f Fix incorrect request json body for `/containers/create` in remote API docs.
This fix tries to fix the incorrect request json body for
`/containers/create` in remote API docs.

When using the example json request for `/containers/create`, there are two
errors:
(1). `invalid character '"' after object key:value pair`
     This is because a `,` is missing after `"Volumes": {}`
     This issue exists in v1.20-v1.24
(2). `Invalid --security-opt: ""`
     This is becasue in `"SecurityOpt": [""]` line, an empty string
     `""` is passed yet `""` is not a valid `SecurityOpt`. Either no string,
     or a valid string (e.g., "no-new-privileges") could be used.
     This issue exists in v1.15-v1.24

This fix updates the docs and correct the above two issues.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-09 18:39:33 +00:00
Yi EungJun 94985b4bff Fix errata; s/RequestUri/ReqestURI/
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-04-09 19:19:35 +09:00
Alan Scherger f67b711277 enable syslog logger to have access to env and labels
Signed-off-by: Alan Scherger <flyinprogrammer@gmail.com>
2016-04-08 19:50:18 -05:00
Yong Tang 0e3846e280 Change HumanSize to BytesSize for memory output in `docker stats`.
This fix tries to fix the discrepancy between `docker stats` and
`docker run` where `docker run` uses RAMInBytes for all memory
related inputs but `docker stats` uses HumanSize for all memory
related outputs.

To be consistent, `docker stats` needs to use BytesSize for all
memory related outputs to conform to RAMInBytes in `docker run`.

This fix addresses this issue. As BytesSize is used, the test
cases needs to be adjusted to match `KiB/MiB/GiB` instead of
`KB/MB/GB`.

The documentation has also been updated.

This fix fixes #21765.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-08 20:01:50 +00:00
Yong Tang 7581cf96fb Additional syslog-format option to allow microsecond resolution in syslog timestamp.
This fix tries to add an additional syslog-format of `rfc5424micro` which follows
the same as rfc5424 except that it use microsecond resolution for timestamp. The
purpose is to solve the issue raised in #21793 where log events might lose its
ordering if happens on the same second.

The timestamp field in rfc5424 is derived from rfc3339, though the maximium
resolution is limited to "TIME-SECFRAC" which is 6 (microsecond resolution).

The appropriate documentation (`docs/admin/logging/overview.md`) has been updated
to reflect the change in this fix.

This fix adds a unit test to cover the newly introduced format.

This fix fixes #21793.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-04-08 05:00:11 +00:00
Hyzhou b83e9df760 Fix the docker image --no-trunk output format
docker 1.10 change the output format of image id.

Signed-off-by: hyzhou.zhy <hyzhou.zhy@alibaba-inc.com>
2016-04-08 08:59:59 +08:00
Kai Qiang Wu(Kennan) 0b207e7558 Fix deprecated format for security-opt
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-07 02:09:18 +00:00