0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28943 commits 14 branches 412 tags 338 MiB
Commit graph

928 commits

Author SHA1 Message Date
Vincent Demeester
00615efced Merge pull request #25025 from cpuguy83/service_inspect_formatter 
Add formatter for service inspect
 2016-09-20 14:49:45 +02:00
Sebastiaan van Stijn
374ae5ce13 Merge pull request #26732 from yuexiao-wang/update-index 
Update on index reference documentation
 2016-09-20 11:42:17 +02:00
yuexiao-wang
0483d77613 Update on index refernce documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-20 16:37:52 +08:00
Vincent Demeester
a43691d645 Merge pull request #26482 from yuexiao-wang/add-option 
Update the options for docker client
 2016-09-20 09:51:57 +02:00
Michael Crosby
ee3ac3aa66 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>
 2016-09-19 17:33:50 -07:00
Brian Goff
54ba82beab 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>
 2016-09-19 16:28:19 -04:00
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
 2016-09-19 17:30:27 +02:00
Sebastiaan van Stijn
533b00da8b
Fix Markdown formatting and missing prompt in service create 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 13:57:39 +02:00
Misty Stanley-Jones
5880d62953
Misty's edits and additions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
 2016-09-19 12:12:54 +02:00
Sebastiaan van Stijn
eb3a01eb43 Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 11:56:59 +02:00
yuexiao-wang
0f0b0db842 fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-18 11:00:19 +08:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
 2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
1c117aa8cc Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
 2016-09-17 03:32:23 +02:00
John Howard
340e5233b2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
Sebastiaan van Stijn
87b174080b
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>
 2016-09-16 17:22:58 +02:00
Sebastiaan van Stijn
7ca02f86de
Add link to logging drivers reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-16 15:29:28 +02:00
Sebastiaan van Stijn
dddea689ab
Synchronize push reference with man page 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-15 18:53:46 +02:00
Sebastiaan van Stijn
edbb8fb86d
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>
 2016-09-15 16:09:24 +02:00
Akihiro Suda
5af5a1be62 add docker events --format 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-15 09:55:29 +00:00
Anusha Ragunathan
e482d4ee71 Merge pull request #26575 from anusha-ragunathan/update_plugin_docs 
Update plugin install docs with registry specifics.
 2016-09-14 14:43:41 -07:00
Anusha Ragunathan
81d5abf334 Update plugin install docs with registry specifics. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-14 10:21:31 -07:00
Sebastiaan van Stijn
9e9ba1e1c1 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
 2016-09-14 17:48:43 +02:00
lixiaobing10051267
7b73b5fd6a fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
8ac2000f50 Merge pull request #25540 from estesp/ro-plus-userns 
Remove --read-only restriction when user ns enabled
 2016-09-14 13:53:58 +02:00
Vincent Demeester
0c90f777b7 Merge pull request #26489 from yuexiao-wang/update-exec 
update option for docker exec
 2016-09-13 11:16:22 +02:00
yuexiao-wang
7084aa24c7 update option for docker commands 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-12 19:10:45 +08:00
yuexiao-wang
1917d3b958 add option and update the description 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-12 16:08:59 +08:00
Yong Tang
256dbe4b75 Fix documentation for Step 0 to Step 1 in docker build 
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.

This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-11 10:52:40 -07:00
Vincent Demeester
e6f76800f5 Merge pull request #26426 from sfsmithcha/carry_pry_25414 
Carry pr 25414
 2016-09-10 11:50:28 +02:00
Charles Smith
e7e85c7e06 carries and closes 25414 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-09 15:57:53 -07:00
allencloud
af4461ad29 support docker node ps multiNodes 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-10 02:52:48 +08:00
Phil Estes
6062ae5742
Remove --read-only restriction when user ns enabled 
The restriction is no longer necessary given changes at the runc layer
related to mount options of the rootfs. Also cleaned up the docs on
restrictions left for userns enabled mode. Re-enabled tests related to
--read-only when testing a userns-enabled daemon in integration-cli.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-09-09 13:23:41 -04:00
Richard Mathie
21a9c64b77 Update service_create.md 
More info on endpoint setting, and service discovery on swarm mode overlay network.

Signed-off-by: Richard Mathie <richard.mathie@amey.co.uk>
 2016-09-08 12:11:48 -07:00
Michael Crosby
061cc41759 Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
 2016-09-08 11:22:21 -07:00
Brian Goff
e96c0fafa0 Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
 2016-09-08 11:09:18 -04:00
lixiaobing10051267
d5fcf57acb Labels info ommitted while inspecting self-defined network 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-08 17:27:33 +08:00
Charles Smith
6f0502b89b Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
 2016-09-07 10:38:59 -07:00
Daniel Nephin
20607e2cc2 Merge pull request #26269 from yuexiao-wang/remove-option 
Remove the option for the command service rm
 2016-09-07 11:31:11 -04:00
Sven Dowideit
e73e37f112 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
 2016-09-07 22:18:26 +10:00
Michael Crosby
0d03c060c7 Merge pull request #26212 from rhvgoyal/xfs-enospc 
devmapper: Set xfs max_retries to 0 upon ENOSPC
 2016-09-06 09:03:09 -07:00
Vincent Demeester
da763602af Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
 2016-09-06 17:47:46 +02:00
Yong Tang
b9e46235fa Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-05 08:24:22 -07:00
Vincent Demeester
01fe5639bc Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
 2016-09-05 09:52:18 +02:00
Akihiro Suda
d6007b4db0 fix docs about sudo docker login 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-05 04:44:18 +00:00
Vincent Demeester
fb8b6438f2
Add health status as action on events documentations 
This was missing from the docs for 1.12.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-09-04 18:01:57 +02:00
Alessandro Boch
e74a937b00 Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-09-02 15:39:49 -07:00
Akihiro Suda
aa47961682 update docs/reference/commandline/service_create.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-02 09:59:20 +00:00
yuexiao-wang
1016cbb642 Remove the option for the command service rm 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-02 17:23:59 +08:00
yuexiao-wang
8ad8245ee3 Remove -h option for docker cli 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-02 11:46:49 +08:00
Vincent Demeester
b14f29dfbd Merge pull request #26241 from YuPengZTE/devNote 
The first letter of “docker“ is small
 2016-09-01 20:53:07 +02:00