1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

27386 commits

Author SHA1 Message Date
Yanqiang Miao
26b6b47420 Remove the support of setting host configuration options when the container starts
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-09-20 20:57:17 +08:00
Vincent Demeester
a43691d645 Merge pull request 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 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 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 from vieux/add_warning_plugin_rm
add check plugin is not used before rm
2016-09-19 16:03:17 -07:00
Sebastiaan van Stijn
8c508ef813 Merge pull request from Microsoft/jjh/ociprocess
Windows: OCI `process` struct and console size to uint
2016-09-19 22:52:16 +02: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 from dnephin/cli-new-command-structure
Restructure CLI Commands
2016-09-19 22:23:37 +02:00
Sebastiaan van Stijn
920cb5834b Merge pull request 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 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 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 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 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 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 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 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 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 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 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 from thaJeztah/update-sshd-example
Update sshd example to use ubuntu 16.04
2016-09-19 13:17:51 +02:00
Sebastiaan van Stijn
b81d12e7a1
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>
2016-09-19 12:52:13 +02:00
Sebastiaan van Stijn
c496b4eb1b Merge pull request from thaJeztah/add-basic-mount-docs
Add --mount syntax documentation to CLI reference
2016-09-19 12:17:07 +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
Sebastiaan van Stijn
1ccd79e1a9 Merge pull request from yuexiao-wang/fix-typo
Fix typo for docs reference
2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
abd02a9ba0 Merge pull request from YuPengZTE/devSUSE
Add prompt of $
2016-09-19 10:45:23 +02:00
Akihiro Suda
69f00a137c Fix a race in libcontainerd/pausemonitor_linux.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-19 07:42:21 +00:00
YuPengZTE
638546d120 Add prompt of $
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-19 10:46:25 +08:00
Brian Goff
45a8f68026 Merge pull request from tonistiigi/id-digest
Generalize content addressable and reference storage
2016-09-18 09:40:16 -04:00
Brian Goff
bc60f5af84 Merge pull request from Microsoft/jjh/firststart
Windows: OCI remove first start
2016-09-18 09:27:10 -04:00
Brian Goff
112ba3637d Merge pull request from Microsoft/jjh/ociuser
Windows: Unify OCI user struct
2016-09-18 09:20:45 -04:00
Brian Goff
fcf77620d6 Merge pull request from pestophagous/fix-typo-understanding-docker
Fix typo in docs. s/methodoligies/methodologies/
2016-09-18 09:09:40 -04:00
Sebastiaan van Stijn
1444401b16 Merge pull request from YuPengZTE/devSUDO
Add bash symbol for sudo
2016-09-18 13:36:13 +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
Alexander Morozov
beea4d93dc Merge pull request from Microsoft/jjh/tp5graphdriver
Windows: Remove TP5 hack from graphdriver
2016-09-17 19:54:58 -07:00
YuPengZTE
ced2729841 The hit is missed
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-18 09:38:20 +08:00
John Howard
56952e2159 Merge pull request from WeiZhang555/fix-flaky-unit-test
Fix flaky unit test
2016-09-17 18:32:11 -07:00
John Howard
f61315f0df Windows: Remove TP5 hack from graphdriver
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-17 16:16:50 -07:00