Commit Graph

6025 Commits

Author SHA1 Message Date
f3d4887540 Update API docs for "HostConfig.Binds"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 708892c4037e9eef6f6c25b5a3551f7779fb8868
Component: engine
2016-09-20 17:41:59 +02:00
3e855af466 Merge pull request #26741 from thaJeztah/fix-api-docs
Fix incorrectly named API options
Upstream-commit: 5fa94084ac049d455603565f517ada00117bc4d4
Component: engine
2016-09-20 09:14:08 -04:00
2b811c42ec Merge pull request #25025 from cpuguy83/service_inspect_formatter
Add formatter for service inspect
Upstream-commit: 00615efced8c8bd27c61ebd1dfc704bcf870cbaf
Component: engine
2016-09-20 14:49:45 +02:00
a262e6d191 Fix incorrectly named API options
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 36a25bdbe4d973aef308fa11b450264dae1bc0b4
Component: engine
2016-09-20 13:51:55 +02:00
1504a332aa Merge pull request #26732 from yuexiao-wang/update-index
Update on index reference documentation
Upstream-commit: 374ae5ce13a91dc7db74485aa99bfe9a361c4719
Component: engine
2016-09-20 11:42:17 +02:00
dadce77b75 Update on index refernce documentation
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0483d776130aa6b7add845bdab3d1d8ee67f7480
Component: engine
2016-09-20 16:37:52 +08:00
37aff3fb80 Merge pull request #26482 from yuexiao-wang/add-option
Update the options for docker client
Upstream-commit: a43691d645e085ad532fdd87a63e9143ba24420a
Component: engine
2016-09-20 09:51:57 +02:00
8ee0f56810 Add init process for zombie fighting
This adds a small C binary for fighting zombies.  It is mounted under
`/dev/init` and is prepended to the args specified by the user.  You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.

You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.

You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.

```c

int main(int argc, char ** argv) {
	pid_t pid = fork();
	if (pid == 0) {
		pid = fork();
		if (pid == 0) {
			exit(0);
		}
		sleep(3);
		exit(0);
	}
	printf("got pid %d and exited\n", pid);
	sleep(20);
}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ee3ac3aa66bfb27b7c21dfb253fdaa113baedd4e
Component: engine
2016-09-19 17:33:50 -07:00
1b60c220e3 Add formatter for service inspect
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 54ba82beab8ef8b71f5a6a2f7082ed7759b40df3
Component: engine
2016-09-19 16:28:19 -04:00
6851b71de6 Merge pull request #26706 from thaJeztah/update-systemd-instructions
Cleanup / sync RHEL, CentOS, Fedora installation docs
Upstream-commit: 920cb5834b66a27b68b83c5b4e81f027103ced68
Component: engine
2016-09-19 22:10:30 +02:00
91ef538450 Cleanup / sync RHEL, CentOS, Fedora installation docs
These installation procedures are very similar, so
synchronized these docs and removed some differences.

Also;

- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
  installation, because most people want to have docker
  started automatically (and overlooked this step).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b2bb4e11aa656947e45b752aa4f5d5b5cdc693cd
Component: engine
2016-09-19 21:30:57 +02:00
69a3d88de2 Fix regex for the json-file logger opts in overview.md
The regex used to describe the max-file and max-size logging options for
the json-file logger were incorrect. The regexes would only match a
single character (a digit or a literal +). Instead the regexes should
match 1 or more digits.

The character class for the units of the max-size also included a pipe
which meant that the regex would match 1| instead of only matching 1m,
1k, and 1g.

Signed-off-by: Steven Erenst <stevenerenst@gmail.com>
Upstream-commit: e9a9015e38fc0996a3dae61393885414b092103f
Component: engine
2016-09-19 10:47:40 -07:00
03207b0f15 Merge pull request #26704 from clbn/patch-1
Fix typos in installation doc for Mac
Upstream-commit: 9d2d89ce6fb009d930d46ede87fce285253df984
Component: engine
2016-09-19 18:25:35 +02:00
14f9dd10a3 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
2016-09-19 17:30:27 +02:00
388c6920f1 Fix typos in installation doc for Mac
Signed-off-by: Alex Olshansky <i@creagenics.com>
Upstream-commit: f7af5cc780cb49b6115c726687dec5ef361ca5fb
Component: engine
2016-09-19 16:04:46 +02:00
4d3a9b605f Fix Markdown formatting and missing prompt in service create
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 533b00da8bed8336debf99a03f2fd2a0692fac6e
Component: engine
2016-09-19 13:57:39 +02:00
91a19ec9c5 Update sshd example to use ubuntu 16.04
Although the example is just for illustrational
purposes, many users are now switching to
Ubuntu 16.04 as the "default" version for Ubuntu,
so updating the example for those that use
this example as a starting point.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b81d12e7a10abfb55f164105365ff175a95ae9e9
Component: engine
2016-09-19 12:52:13 +02:00
dd0606cd40 Misty's edits and additions
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
Upstream-commit: 5880d629533d9b8ad9889500fe841cb2e31a71c8
Component: engine
2016-09-19 12:12:54 +02:00
e605090acb Add --mount syntax documentation to CLI reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb3a01eb432473beae968a0c9f3817af8b7a7d53
Component: engine
2016-09-19 11:56:59 +02:00
306c301f92 Merge pull request #26682 from yuexiao-wang/fix-typo
Fix typo for docs reference
Upstream-commit: 1ccd79e1a920f9120090f0355cd7b557f8d57631
Component: engine
2016-09-19 11:14:46 +02:00
744afc226e Merge pull request #26691 from YuPengZTE/devSUSE
Add prompt of $
Upstream-commit: abd02a9ba0aea79e0b77b8dfb65c8d77614f3ecf
Component: engine
2016-09-19 10:45:23 +02:00
1ea61b91e9 Add prompt of $
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 638546d1206dd229c5e00df0725de6966725b2e0
Component: engine
2016-09-19 10:46:25 +08:00
41b6bee4d9 Merge pull request #26675 from pestophagous/fix-typo-understanding-docker
Fix typo in docs. s/methodoligies/methodologies/
Upstream-commit: fcf77620d632457910507db47f8b7380c7276962
Component: engine
2016-09-18 09:09:40 -04:00
8c00a65ba2 Merge pull request #26678 from YuPengZTE/devSUDO
Add bash symbol for sudo
Upstream-commit: 1444401b164006cb13c23208dc8aeebcf980f629
Component: engine
2016-09-18 13:36:13 +02:00
c4eabb777e fix typo for docs reference
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
2016-09-18 11:00:19 +08:00
215a6916ca The hit is missed
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: ced272984157e277523a942505435aa392913ac4
Component: engine
2016-09-18 09:38:20 +08:00
bc5d705612 Fix typo in docs. s/methodoligies/methodologies/
Signed-off-by: K Heller <pestophagous@gmail.com>
Upstream-commit: 191adcfb637ea1b52d2da9a75e4e1e4938d9550c
Component: engine
2016-09-17 15:37:03 -07:00
5049c43226 Merge pull request #25737 from Microsoft/jjh-statistics
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
2016-09-17 09:31:24 -07:00
029442b3b0 Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
Fix service and tasks API documentation
Upstream-commit: 788a8a3cac67b72d3c52bd3bc8b09fcc0ee438a8
Component: engine
2016-09-17 16:13:15 +02:00
613c0e8111 Merge pull request #26654 from thaJeztah/sync-api-docs
Synchronize API docs
Upstream-commit: 1fb556bb7ebed206ebacf13148f912f7347d5489
Component: engine
2016-09-17 16:11:42 +02:00
665d5fc5bb Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
Move HostConfig.Mounts to correct API version
Upstream-commit: 2f5b37919286f272b591ab428fee13cb6b5d0014
Component: engine
2016-09-17 13:53:37 +02:00
32dd641688 Merge pull request #26266 from YuPengZTE/dev
The etc and dot is seprated
Upstream-commit: d93a62e9bef374ff501f155583e707c1ae77926b
Component: engine
2016-09-17 03:37:00 +02:00
6c1fbaf344 Merge pull request #26289 from aboch/doc
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
2016-09-17 03:32:23 +02:00
8cdc29bdf2 Merge pull request #26558 from lixiaobing10051267/masterSymbol2
add bash symbol for docker network inspect
Upstream-commit: 0bd281c7cb610baa2b906d7eb42062eeb209b1a9
Component: engine
2016-09-17 03:26:55 +02:00
0a2b85a132 Synchronize API docs
This synchronizes changes between API versions, and:

- applies e0a552504e64192946c86d3bdd517ae7b3af348f to
  older versions of the documentation
- applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to
  API version 1.25
- syncs some minor differences

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5
Component: engine
2016-09-17 03:02:12 +02:00
7bce42c737 Move HostConfig.Mounts to correct API version
This was added in fc7b904dced4d18d49c8a6c47ae3f415d16d0c43,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd73ceffd84d6d3af695a70485ca0d7899d0475a
Component: engine
2016-09-17 02:36:07 +02:00
a3575ae5f7 Fix service and tasks API documentation
The documentation contained some outdated information
on these endpoints.

This change fixes those parts of the documentation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d69409fd43e73829209315de79abf79000c4c720
Component: engine
2016-09-17 02:29:38 +02:00
3e89d9cc8d Remove extra paren in run --link docs
Signed-off-by: Josh Bodah <jb3689@yahoo.com>
Upstream-commit: 484fbe236dcab9fb5b8d48844a8cdc9d614e32e9
Component: engine
2016-09-16 15:32:12 -04:00
7342ae40e2 Windows: stats support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
4f3981c6de Merge pull request #26620 from runcom/fix-docs
docs: reference: api: clarify pull all tags
Upstream-commit: 8a7006ff8e74477c4ad85bde2e2094f7b40244da
Component: engine
2016-09-16 20:56:04 +02:00
fc3c6766ab Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
Upstream-commit: efe4e914efe5f42a5b5e424ed519fda71343f7de
Component: engine
2016-09-16 10:22:09 -07:00
3a3e6ec157 Merge pull request #26637 from thaJeztah/fix-cli-prompt
Use "sudo" for dockerd examples
Upstream-commit: d05e34ca9bcfdcf954ea5793721c20133eed9277
Component: engine
2016-09-16 17:44:07 +02:00
15e6354e7d Use "sudo" for dockerd examples
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4
Component: engine
2016-09-16 17:22:58 +02:00
a7caeb2743 Merge pull request #26618 from AkihiroSuda/fix-apparmor
apparmor: prohibit /sys/firmware/** from being accessed
Upstream-commit: 07b5311147c319a003324e8f26ceb829ed5cc240
Component: engine
2016-09-16 07:41:36 -07:00
db61cfcc59 docs: reference: api: clarify pull all tags
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 03a8b6798d030a952e85f15208aeea1215e3f801
Component: engine
2016-09-16 16:35:15 +02:00
6f7161dac7 Add link to logging drivers reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7ca02f86de2ceef980cad98faefc15cbc628c91a
Component: engine
2016-09-16 15:29:28 +02:00
23bac4b64f apparmor: prohibit /sys/firmware/** from being accessed
Some firmware information including SMBIOS and ACPI tables were unexpectedly exposed

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 693b4ac67ad0638be9defbae771f62d860380f31
Component: engine
2016-09-16 02:21:31 +00:00
00c4e8a77c Synchronize push reference with man page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dddea689ab45ce146e6ac3a1199235e1f36ffe29
Component: engine
2016-09-15 18:53:46 +02:00
c86634e4ea Merge pull request #26581 from yongtang/09142016-docs-getstarted-step-four
Fix a couple of issues in Get Started docs
Upstream-commit: 51a981fd5fa01d827854ff5afbb78029e4e94e7b
Component: engine
2016-09-15 16:51:49 +02:00
78d01f16b4 Restore missing "format" example
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: edbb8fb86d7d0b715adc15415f0cb187433092a5
Component: engine
2016-09-15 16:09:24 +02:00