Zhang Wei
2b773257e0
Support parallel rm
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-09-28 12:07:18 +08:00
Zhang Wei
d2bb3aba7e
Support parallel kill
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-09-28 12:03:19 +08:00
Vincent Demeester
6997182882
Merge pull request #26725 from StefanScherer/log-error-to-event-log
...
Windows: Write fatal error to event log if running as service
2016-09-20 16:26:21 +02:00
Vincent Demeester
be9e3f59e6
Merge pull request #26270 from AkihiroSuda/fix-typo-docker-images
...
[nit] fix the man page and zsh completion for `docker images`
2016-09-20 15:56:23 +02:00
Vincent Demeester
a51967cd02
Merge pull request #26716 from dnephin/move-system-commands
...
Create system subcommand
2016-09-20 15:54:01 +02:00
Brian Goff
1dded94b1b
Merge pull request #26738 from thaJeztah/remove-unused-state-functions
...
Removed unused state functions
2016-09-20 09:16:30 -04:00
Brian Goff
5fa94084ac
Merge pull request #26741 from thaJeztah/fix-api-docs
...
Fix incorrectly named API options
2016-09-20 09:14:08 -04:00
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
36a25bdbe4
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>
2016-09-20 13:51:55 +02:00
Sebastiaan van Stijn
a28c389da1
Removed unused state functions
...
This removes the SetStoppedLocking, and
SetRestartingLocking functions, which
were not used anywhere.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-20 13:09:18 +02:00
Vincent Demeester
fe0d7e0799
Merge pull request #26727 from Microsoft/jjh/breakcontinue
...
Oops, break should have been continue
2016-09-20 11:43:27 +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
Sebastiaan van Stijn
fcd035e2f9
Merge pull request #26623 from runcom/rev-plugins-timeout
...
Revert "Add default timeout to pkg/plugins/client"
2016-09-20 11:40:40 +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
Antonio Murdaca
5c35bfed3f
Revert "Add default timeout to pkg/plugins/client"
...
This reverts commit 0699b00d26
.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-20 10:01:03 +02: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
eabae093f4
Merge pull request #26061 from crosbymichael/reaper
...
Add init process for zombie fighting and signal handling
2016-09-19 17:36:12 -07: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
Daniel Nephin
d8c9951707
Merge pull request #26717 from dnephin/fix_experimental_commands
...
Make all the experimental subcommand consistent
2016-09-19 19:29:48 -04:00
Michael Crosby
69114bb3a7
Merge pull request #26442 from vieux/add_warning_plugin_rm
...
add check plugin is not used before rm
2016-09-19 16:03:17 -07:00
John Howard
bbbc720620
Oops, break should have been continue
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-19 14:41:27 -07:00
Sebastiaan van Stijn
8c508ef813
Merge pull request #26579 from Microsoft/jjh/ociprocess
...
Windows: OCI `process` struct and console size to uint
2016-09-19 22:52:16 +02:00
Stefan Scherer
40868e263d
Write fatal error to event log if running as service
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-09-19 22:36:33 +02:00
Daniel Nephin
89ea589d2c
Create a system subcommand for events and info.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-19 16:29:17 -04: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
Daniel Nephin
6eefcea51a
Make all the experimental subcommand consistent.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-19 16:27:23 -04:00
Sebastiaan van Stijn
ad9ceff3b3
Merge pull request #26025 from dnephin/cli-new-command-structure
...
Restructure CLI Commands
2016-09-19 22:23:37 +02:00
Sebastiaan van Stijn
920cb5834b
Merge pull request #26706 from thaJeztah/update-systemd-instructions
...
Cleanup / sync RHEL, CentOS, Fedora installation docs
2016-09-19 22:10:30 +02:00
Brian Goff
b7e189ed1f
Merge pull request #26640 from Microsoft/jjh/removeosversion
...
Windows: Remove osversion from OCI
2016-09-19 15:42:34 -04:00
Sebastiaan van Stijn
b2bb4e11aa
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>
2016-09-19 21:30:57 +02:00
Sebastiaan van Stijn
772db11fd0
Merge pull request #26712 from BlueMonday/master
...
Fix regex for the json-file logger opts in overview.md
2016-09-19 21:01:51 +02:00
Sebastiaan van Stijn
5bcaa0e4bb
Merge pull request #26715 from thaJeztah/move-mary-to-alumni
...
Move Mary to alumni
2016-09-19 20:15:23 +02:00
Steven Erenst
e9a9015e38
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>
2016-09-19 10:47:40 -07:00
John Howard
53774423ff
Windows: OCI process struct convergence
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-19 10:34:31 -07:00
Daniel Nephin
a7c8bcac2b
Only hide commands if the env variable is set.
...
Better formatting for usage template.
Group commands in usage to management/operation commands.
Remove the word Docker from the description of management commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-19 13:28:15 -04:00
Daniel Nephin
dda198761b
Move the search command to the registry package.
...
And move it back to the top-level command.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-19 13:28:15 -04:00
Daniel Nephin
b993609d5a
Move canonical image and container commands into a command group
...
Hide some top level commands
Add docker container and image inspect commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-19 13:28:02 -04:00
Kenfe-Mickaël Laventure
3fd3d28f5f
Merge pull request #26505 from Microsoft/jjh/ocistep1
...
Windows OCI convergence step 1
2016-09-19 10:23:11 -07:00
John Howard
72de562943
Windows: Remove osversion from OCI
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-19 10:16:15 -07:00
Tõnis Tiigi
b72c7f74a6
Merge pull request #26577 from Microsoft/jjh/fstabmount
...
Windows: Move to fstab options as per OCI
2016-09-19 10:13:46 -07:00
Sebastiaan van Stijn
9d2d89ce6f
Merge pull request #26704 from clbn/patch-1
...
Fix typos in installation doc for Mac
2016-09-19 18:25:35 +02:00
Sebastiaan van Stijn
1161b10a0a
Merge pull request #26708 from thaJeztah/add-evan-as-curator
...
Add Evan as curator
2016-09-19 18:18:51 +02:00
Sebastiaan van Stijn
6da5889c5b
Move Mary to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-19 18:09:30 +02:00
Brian Goff
622faab3f6
Merge pull request #26695 from AkihiroSuda/fix-pause-race
...
Fix a race in libcontainerd/pausemonitor_linux.go
2016-09-19 12:03:56 -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
32161fc052
Add Evan as curator
...
Evan is gonna help triaging issues, so
adding him as a "curator" to make it official
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-19 17:09:34 +02:00
Alex Olshansky
f7af5cc780
Fix typos in installation doc for Mac
...
Signed-off-by: Alex Olshansky <i@creagenics.com>
2016-09-19 16:04:46 +02:00
Sebastiaan van Stijn
c2d6e76a70
Merge pull request #26701 from thaJeztah/fix-markdown-formatting
...
Fix Markdown formatting and missing prompt in service create
2016-09-19 14:58:06 +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
Sebastiaan van Stijn
b16bfbaddd
Merge pull request #26699 from thaJeztah/update-sshd-example
...
Update sshd example to use ubuntu 16.04
2016-09-19 13:17:51 +02:00