InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,439 Commits 21 Branches 532 Tags
6ceec828bff1663f4193ca4ffc308e4ccb962ec5
Commit Graph

27439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Howard
6ceec828bf Windows: Remove TP5 support from volume 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-21 11:03:19 -07:00
Daniel Nephin
c0699cd4a4 Merge pull request #24987 from ripcurld00d/stats_format_prod 
Add format to stats
 2016-09-21 10:38:21 -04:00
Brian Goff
a7b0b6e2a9 Merge pull request #26770 from YuPengZTE/devEG 
'eg.' should be 'e.g.'
 2016-09-21 10:03:23 -04:00
Vincent Demeester
340f50c1c4 Merge pull request #26737 from miaoyq/del-setting-hostconfig-during-start-container 
Modify the print and comment of setting host configuration options when the container starts
 2016-09-21 13:30:53 +02:00
Sebastiaan van Stijn
fd1037b432 Merge pull request #26723 from anusha-ragunathan/volmount_win 
Add missing call to "VolumeDriver.Mount" during container start.
 2016-09-21 10:28:29 +02:00
Antonio Murdaca
b683958dee Merge pull request #26751 from Microsoft/jjh/reverthostconfig 
Revert Box from HostConfig
 2016-09-21 09:53:39 +02:00
YuPengZTE
0b86bca0b5 'eg.' should be 'e.g.' 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-21 13:48:06 +08:00
Sebastiaan van Stijn
2a3205d7b7 Merge pull request #26752 from icecrime/update_triage_process 
Update triage process
 2016-09-20 23:26:56 +02:00
Vincent Demeester
758a809f54 Merge pull request #26538 from LK4D4/update_grpc 
Update grpc to v1.0.1-GA
 2016-09-20 23:19:26 +02:00
Tõnis Tiigi
511fd49402 Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing 
Windows: OCI aggressive namespacing
 2016-09-20 13:37:41 -07:00
Arnaud Porterie (icecrime)
3dcb11982f Update triage process 
Remove `group/*` labels, and explain how milestones are managed.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-09-20 13:00:13 -07:00
John Howard
6b74e2f09d Revert Box from HostConfig 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-20 12:01:04 -07:00
Anusha Ragunathan
ef728a1641 Merge pull request #26645 from anusha-ragunathan/use-pluginv2-graph 
Make graphdrivers work with pluginv2.
 2016-09-20 10:59:33 -07:00
John Howard
4348878242 Merge pull request #25849 from darrenstahlmsft/LibcontainerdRaces 
Lock all calls to hcsshim to prevent close races
 2016-09-20 10:34:54 -07:00
Alexander Morozov
5fb3832432 libcontainerd: do not use failfast for events stream 
New grpc uses failfast by default, but that code was written with other
default in mind, so just preserve it for now.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-20 09:24:40 -07:00
Alexander Morozov
eeceb0ccc8 vendor: update containerd and swarmkit 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-20 09:24:36 -07:00
Sebastiaan van Stijn
6eb6eaf718 Merge pull request #26720 from AkihiroSuda/fix-TestBuildApiDockerFileRemote 
[test] Fix TestBuildApiDockerFileRemote
 2016-09-20 17:57:01 +02:00
Anusha Ragunathan
fefea805e9 Make graphdrivers work with pluginv2. 
As part of making graphdrivers support pluginv2, a PluginGetter
interface was necessary for cleaner separation and avoiding import
cycles.

This commit creates a PluginGetter interface and makes pluginStore
implement it. Then the pluginStore object is created in the daemon
(rather than by the plugin manager) and passed to plugin init as
well as to the different subsystems (eg. graphdrivers, volumedrivers).
A side effect of this change was that some code was moved out of
experimental. This is good, since plugin support will be stable soon.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-20 08:49:48 -07:00
Sebastiaan van Stijn
a65f01052e Merge pull request #26598 from thaJeztah/fix-binds-api-docs 
Update API docs for "HostConfig.Binds"
 2016-09-20 17:49:45 +02:00
Sebastiaan van Stijn
708892c403 Update API docs for "HostConfig.Binds" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-20 17:41:59 +02:00
Kenfe-Mickaël Laventure
beea098b97 Merge pull request #26736 from dsheets/fix-typo-from-26061 
Fix typo in api/types/container/host_config.go
 2016-09-20 08:26:18 -07:00
Arnaud Porterie
359742f2a9 Merge pull request #25097 from msabansal/autosubnet 
Fixing support for nat to choose a subnet automatically
 2016-09-20 15:23:44 +00:00
Alexander Morozov
e3e6d9f9d0 Merge pull request #26740 from tagomoris/update-fluent-logger-golang-1.2.0 
Update fluent-logger-golang to v1.2.0.
 2016-09-20 07:49:30 -07:00
Vincent Demeester
7a86930c74 Merge pull request #26436 from stevvooe/remove-transport-package 
client: remove transport package
 2016-09-20 16:43:56 +02: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
Akihiro Suda
f453261b4a Fix TestBuildApiDockerFileRemote 
TestBuildApiDockerFileRemote has been consistently failing (EPERM) on the host
with #26618, which prohibits /sys/firmware from being accessed using apparmor.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-20 14:15:37 +00: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
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
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
Satoshi Tagomori
87124b9d62 Update fluent-logger-golang to v1.2.0. 
Fix race condition issue to solve an issue about "panic: runtime error: invalid memory address or nil pointer dereference".
This fix stabilize Docker daemon under the situation of communication problem with Fluentd processes.

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
 2016-09-20 20:31:22 +09: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
David Sheets
a003419fca Fix typo in api/types/container/host_config.go 
Originally merged in #26061.

Signed-off-by: David Sheets <sheets@alum.mit.edu>
 2016-09-20 10:41:08 +01: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
Anusha Ragunathan
b15264004d Add missing call to "VolumeDriver.Mount" during container start. 
On container start, volume mounts are setup which should include
invoking "VolumeDriver.Mount" to setup necessary mounts. This was
missing for Windows containers. Fix that.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-19 14:40:45 -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