Commit Graph

25725 Commits

Author SHA1 Message Date
fe82ab0481 Merge pull request #26538 from LK4D4/update_grpc
Update grpc to v1.0.1-GA
Upstream-commit: 758a809f5453355c6d118271db971d90248652f5
Component: engine
2016-09-20 23:19:26 +02:00
4145d55809 Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing
Windows: OCI aggressive namespacing
Upstream-commit: 511fd4940282f4ed6df39f3c2ebc8b9a0f060c82
Component: engine
2016-09-20 13:37:41 -07:00
de2d72b5d2 Merge pull request #26645 from anusha-ragunathan/use-pluginv2-graph
Make graphdrivers work with pluginv2.
Upstream-commit: ef728a1641c354d246bb66f40b662ca8f5fd68c3
Component: engine
2016-09-20 10:59:33 -07:00
96b868c729 Merge pull request #25849 from darrenstahlmsft/LibcontainerdRaces
Lock all calls to hcsshim to prevent close races
Upstream-commit: 434887824241806f6bc0a686966245c569778c00
Component: engine
2016-09-20 10:34:54 -07:00
caffc36efd 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>
Upstream-commit: 5fb383243234dfebc468207cfd7f64eca1b7f849
Component: engine
2016-09-20 09:24:40 -07:00
53ebd11aff vendor: update containerd and swarmkit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: eeceb0ccc8318ecbf577147363666b959959450e
Component: engine
2016-09-20 09:24:36 -07:00
0313da09a5 Merge pull request #26720 from AkihiroSuda/fix-TestBuildApiDockerFileRemote
[test] Fix TestBuildApiDockerFileRemote
Upstream-commit: 6eb6eaf7181ce9a37fd9bc60422f9993aa59d3c3
Component: engine
2016-09-20 17:57:01 +02:00
f07146ebf8 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>
Upstream-commit: fefea805e930a67fb6327f8e59415932861358cb
Component: engine
2016-09-20 08:49:48 -07:00
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
b46d1e70d8 Merge pull request #26736 from dsheets/fix-typo-from-26061
Fix typo in api/types/container/host_config.go
Upstream-commit: beea098b97a160f027bd33f1afeaed30724b98af
Component: engine
2016-09-20 08:26:18 -07:00
6dc9c290b5 Merge pull request #25097 from msabansal/autosubnet
Fixing support for nat to choose a subnet automatically
Upstream-commit: 359742f2a9f4132e0a687bef12f19cffca4a7230
Component: engine
2016-09-20 15:23:44 +00:00
c0e030685b Merge pull request #26740 from tagomoris/update-fluent-logger-golang-1.2.0
Update fluent-logger-golang to v1.2.0.
Upstream-commit: e3e6d9f9d00de5a559cb162f1f08b36313e6b9ab
Component: engine
2016-09-20 07:49:30 -07:00
90dfc08974 Merge pull request #26436 from stevvooe/remove-transport-package
client: remove transport package 
Upstream-commit: 7a86930c7452e19ee72557bb8264e81378ccfbb5
Component: engine
2016-09-20 16:43:56 +02:00
7481f3769d Merge pull request #26725 from StefanScherer/log-error-to-event-log
Windows: Write fatal error to event log if running as service
Upstream-commit: 6997182882f32dca3c7b5e17e3d140e18f712331
Component: engine
2016-09-20 16:26:21 +02:00
782ab7bfdc 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>
Upstream-commit: f453261b4a53ab71db8b78ea119b4edd69b95ae3
Component: engine
2016-09-20 14:15:37 +00:00
8c9dacb458 Merge pull request #26270 from AkihiroSuda/fix-typo-docker-images
[nit] fix the man page and zsh completion for `docker images`
Upstream-commit: be9e3f59e625a7be05f21a23f6debfb3f6728573
Component: engine
2016-09-20 15:56:23 +02:00
1cc009fe4e Merge pull request #26716 from dnephin/move-system-commands
Create system  subcommand
Upstream-commit: a51967cd0281d150987b60a77f3ba9203ff6f36d
Component: engine
2016-09-20 15:54:01 +02:00
9ee86916b6 Merge pull request #26738 from thaJeztah/remove-unused-state-functions
Removed unused state functions
Upstream-commit: 1dded94b1b687167fd479db342bdcb9069297692
Component: engine
2016-09-20 09:16:30 -04: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
19f0411692 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>
Upstream-commit: 87124b9d62bc71f7632126cf7f8d5eb805c4a7f1
Component: engine
2016-09-20 20:31:22 +09:00
b99f52832d 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>
Upstream-commit: a28c389da109808c5b39da02fdfd24b9e36137fe
Component: engine
2016-09-20 13:09:18 +02:00
1de29e4a8e Merge pull request #26727 from Microsoft/jjh/breakcontinue
Oops, break should have been continue
Upstream-commit: fe0d7e0799f20af220f7da18d17c26cd6ec871b7
Component: engine
2016-09-20 11:43:27 +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
a8d3dd9225 Fix typo in api/types/container/host_config.go
Originally merged in #26061.

Signed-off-by: David Sheets <sheets@alum.mit.edu>
Upstream-commit: a003419fca2c4ce7ed53edc8da67a22748aa4a23
Component: engine
2016-09-20 10:41:08 +01: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
4cd6f89f27 Revert "Add default timeout to pkg/plugins/client"
This reverts commit 0699b00d26a60f4a8447572b34c4aad1ce73d2e1.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5c35bfed3f4823e205c5d5b171f23972ff8b3de0
Component: engine
2016-09-20 10:01:03 +02: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
51750bf53a Merge pull request #26717 from dnephin/fix_experimental_commands
Make all the experimental subcommand consistent
Upstream-commit: d8c9951707b1a893518888e04ac1bfd80e26f19d
Component: engine
2016-09-19 19:29:48 -04:00
5f83c7f680 Merge pull request #26442 from vieux/add_warning_plugin_rm
add check plugin is not used before rm
Upstream-commit: 69114bb3a759d74baa1f6809d3e4610c69b8be07
Component: engine
2016-09-19 16:03:17 -07:00
7330d7eef7 Oops, break should have been continue
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bbbc720620befd1ba6f1ff9b0ac69a590bdac68e
Component: engine
2016-09-19 14:41:27 -07:00
62c8ac5cdc Merge pull request #26579 from Microsoft/jjh/ociprocess
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
2016-09-19 22:52:16 +02:00
d99e04e924 Write fatal error to event log if running as service
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 40868e263d7a239aa10acd922bd69ba5a943781e
Component: engine
2016-09-19 22:36:33 +02:00
1e564455f7 Create a system subcommand for events and info.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 89ea589d2c9660c3eeaebe031dcfdd4b264a695b
Component: engine
2016-09-19 16:29:17 -04: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
cca442f52e Make all the experimental subcommand consistent.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6eefcea51a85d202fcb1e282c6c74b4553743107
Component: engine
2016-09-19 16:27:23 -04:00
0afc2f6a90 Merge pull request #26025 from dnephin/cli-new-command-structure
Restructure CLI Commands
Upstream-commit: ad9ceff3b3497eab655672ab1a9f99bf37a57d43
Component: engine
2016-09-19 22:23:37 +02: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
be47d46c3b Lock all calls to hcsshim to prevent close races
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 740e26f384fe4fe70b5dd2ec5ef80cfdbafac177
Component: engine
2016-09-19 12:59:02 -07:00
abf6940f56 Merge pull request #26640 from Microsoft/jjh/removeosversion
Windows: Remove osversion from OCI
Upstream-commit: b7e189ed1fd474d7cbdacc3b6b76e97fc2abf017
Component: engine
2016-09-19 15:42:34 -04: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
88878427f1 Merge pull request #26712 from BlueMonday/master
Fix regex for the json-file logger opts in overview.md
Upstream-commit: 772db11fd0cfdf3c22fb93ba69742e81c4a695bb
Component: engine
2016-09-19 21:01:51 +02:00
7360a13030 client: remove transport package
This package doesn't really seem to do anything of real interest.
Removing it and replacing with a few helper functions. Most of this was
maintaining a fork of ctxhttp to support a mock that was unnecessary.

We could probably do with a further refactor of the client interface.
There is a lot of confusion of between transport, http layer and
application layer that makes for some awkward code. This change
improves the situation to the point where no breaking changes are
introduced.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9a072adff3fcd90c4f36214b355ef27b423f0144
Component: engine
2016-09-19 11:19:55 -07:00
fec88c3f0c Merge pull request #26715 from thaJeztah/move-mary-to-alumni
Move Mary to alumni
Upstream-commit: 5bcaa0e4bb1173be7bde75c30423cb13f7a56db0
Component: engine
2016-09-19 20:15:23 +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
92d37247b3 Windows: OCI process struct convergence
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
2016-09-19 10:34:31 -07:00
89cbe8e685 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>
Upstream-commit: a7c8bcac2ba60d6dd25a1157085d9245bed556ce
Component: engine
2016-09-19 13:28:15 -04:00
84957d85e8 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>
Upstream-commit: dda198761b9638ff1a0f5a4522751267d2faca8a
Component: engine
2016-09-19 13:28:15 -04:00