docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
27,447 Commits 12 Branches 297 Tags
05ab8e37e34888f1b96934a75e7b2f8271ad4cac
Commit Graph

25746 Commits

Author SHA1 Message Date
John Howard
05ab8e37e3 Windows: Data race in libcontainerd (si) 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2499dff6433105024c9434c652731087f32892c
Component: engine
 2016-09-21 14:36:51 -07:00
Sebastiaan van Stijn
7db50d1196 Merge pull request #26786 from Microsoft/jjh/vol14350 
Windows: Remove TP5 support from volume
Upstream-commit: 7e6db44e2b5ae54d54a653e050a669c1f56f3ff8
Component: engine
 2016-09-21 21:23:34 +02:00
Sebastiaan van Stijn
e3368b42d2 Merge pull request #26788 from albers/completion-stats--format 
Add bash completion for `docker stats --format`
Upstream-commit: f8df4b5c2e2d8a61d605e91a9c77e1af5557bf65
Component: engine
 2016-09-21 21:22:02 +02:00
Vincent Demeester
15cdd422af Merge pull request #26769 from portworx/master 
Add Portworx description
Upstream-commit: 7e20704bf84ad47663ffe66d2c4c6f1c5116dd9d
Component: engine
 2016-09-21 21:13:39 +02:00
Brian Goff
a6f0bebbca Merge pull request #26753 from LK4D4/fix_flaky_group_test 
integration: fix flaky TestSwarmServiceWithGroup
Upstream-commit: 62faeb5d93b036a4f4ff6bbade3c99930bff1ad9
Component: engine
 2016-09-21 15:00:53 -04:00
Harald Albers
4d0761852a Add bash completion for docker stats --format 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ed0f53d7b6c64044a02e65251e92e7cac7f41c14
Component: engine
 2016-09-21 20:19:14 +02:00
John Howard
31236accf6 Windows: Remove TP5 support from volume 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6ceec828bff1663f4193ca4ffc308e4ccb962ec5
Component: engine
 2016-09-21 11:03:19 -07:00
Jeff Silberman
fadc0c5e00 Add Portworx Volume Plugin Description 
Signed-off-by: Jeff Silberman <jsilberm@gmail.com>
Upstream-commit: da2159ea1c366ac64b0f498a8aca0ee595dae558
Component: engine
 2016-09-21 09:24:32 -07:00
Daniel Nephin
ba3ea763a4 Merge pull request #24987 from ripcurld00d/stats_format_prod 
Add format to stats
Upstream-commit: c0699cd4a43ccc3b1e3624379e46e9ed94f7428c
Component: engine
 2016-09-21 10:38:21 -04:00
Brian Goff
38db9ff302 Merge pull request #26770 from YuPengZTE/devEG 
'eg.' should be 'e.g.'
Upstream-commit: a7b0b6e2a9360115e9bca719f6bdb6e9d8fc3415
Component: engine
 2016-09-21 10:03:23 -04:00
Vincent Demeester
b9df1ee797 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
Upstream-commit: 340f50c1c4e1c0dc54f1d94b4dedf3f46db0d12b
Component: engine
 2016-09-21 13:30:53 +02:00
Sebastiaan van Stijn
70015a6933 Merge pull request #26723 from anusha-ragunathan/volmount_win 
Add missing call to "VolumeDriver.Mount" during container start.
Upstream-commit: fd1037b4325c1ae5b2e68d6f39ee0cd58a0a7d48
Component: engine
 2016-09-21 10:28:29 +02:00
Antonio Murdaca
d73f6e50df Merge pull request #26751 from Microsoft/jjh/reverthostconfig 
Revert Box from HostConfig
Upstream-commit: b683958deeaae20463649085516d57df2fbdec53
Component: engine
 2016-09-21 09:53:39 +02:00
YuPengZTE
de0192fa30 'eg.' should be 'e.g.' 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 0b86bca0b5c627ebb9524ecf5295c2c91e4bd8f5
Component: engine
 2016-09-21 13:48:06 +08:00
Sebastiaan van Stijn
656af8fe4a Merge pull request #26752 from icecrime/update_triage_process 
Update triage process
Upstream-commit: 2a3205d7b770fec0eb1f8d90c5342f98a12a74a1
Component: engine
 2016-09-20 23:26:56 +02:00
Vincent Demeester
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
Tõnis Tiigi
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
Arnaud Porterie (icecrime)
634d12a516 Update triage process 
Remove `group/*` labels, and explain how milestones are managed.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3dcb11982f250777430ffecbaf5bc936c48eccfb
Component: engine
 2016-09-20 13:00:13 -07:00
Alexander Morozov
87c5d52952 integration: fix flaky TestSwarmServiceWithGroup 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ef4bcf23e6d2324f15628ed3c0e8e8200593bd5f
Component: engine
 2016-09-20 12:07:30 -07:00
John Howard
7b0a3056fd Revert Box from HostConfig 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6b74e2f09dfe2627cd639d683e0896b938f38313
Component: engine
 2016-09-20 12:01:04 -07:00
Anusha Ragunathan
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
John Howard
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
Alexander Morozov
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
Alexander Morozov
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
Sebastiaan van Stijn
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
Anusha Ragunathan
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
Sebastiaan van Stijn
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
Kenfe-Mickaël Laventure
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
Arnaud Porterie
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
Alexander Morozov
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
Vincent Demeester
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
Vincent Demeester
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
Akihiro Suda
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
Vincent Demeester
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
Vincent Demeester
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
Brian Goff
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
Brian Goff
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
Yanqiang Miao
565478a4ad 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>
Upstream-commit: 26b6b47420be3e0d932a5e128ac2304b9e93efc2
Component: engine
 2016-09-20 20:57:17 +08:00
Vincent Demeester
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
Sebastiaan van Stijn
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
Satoshi Tagomori
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Sebastiaan van Stijn
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
David Sheets
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
yuexiao-wang
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
Antonio Murdaca
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
Vincent Demeester
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
Michael Crosby
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
Daniel Nephin
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