docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
27,539 Commits 12 Branches 297 Tags
845977e0ef927118795aaa60448891ed284940fa
Commit Graph

4075 Commits

Author SHA1 Message Date
Yanqiang Miao
dc54335e17 Delete the redundant function 'errClusterNetworkOnRun' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 9c3d1236d22504410bf7363acbad382917e3a630
Component: engine
 2016-09-24 11:24:48 +08:00
Brian Goff
a1a96e1887 Merge pull request #26534 from allencloud/better-checkpoint 
change code and fix docs about checkpoint
Upstream-commit: 047400c64c9a19fe9c20176dc9ca5d86301a91ae
Component: engine
 2016-09-23 12:34:55 -04:00
Brian Goff
d76a37578e Merge pull request #26844 from mrjana/net 
Vendoring libnetwork @6caf9022fa09
Upstream-commit: 2c41c020d19e76030a4c6447fafe79eb8171ab14
Component: engine
 2016-09-23 12:03:02 -04:00
John Howard
7366022982 Merge pull request #26842 from jstarks/fix_save 
Windows: Back up files mutated during layer import
Upstream-commit: 5039d9aa6ccf6e6cbcefe7b61c4f1e0af0171bd2
Component: engine
 2016-09-23 08:37:24 -07:00
allencloud
f557e61a5e change-code-and-fix-docs-about-checkpoint 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9b4ba34d046fc9fd65fc060af016d2b2b9b95957
Component: engine
 2016-09-23 19:37:43 +08:00
Sebastiaan van Stijn
29a3433f96 Merge pull request #26805 from miaoyq/refactor-allocateNetwork 
Replace two array with a map type, make it easier to understand.
Upstream-commit: 8643903e49c2d25272e59fe09a75803aa05ed841
Component: engine
 2016-09-23 10:15:37 +02:00
Jana Radhakrishnan
c42acbfe8e Add GetListenAddress in ClusterProvider 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: fbcdca7ebcd45d74c40fbccbb07f2d3decfb8628
Component: engine
 2016-09-22 21:00:32 -07:00
Madhu Venugopal
0afb3aa46c Merge pull request #25987 from msabansal/dnssupport 
Support for Windows service discovery
Upstream-commit: d3139fc84af390142341a29d3512462d1a449045
Component: engine
 2016-09-22 20:56:03 -07:00
Yanqiang Miao
792dff1fb0 Replace two array with a map type, make it easier to understand. 
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: 1989b1b58cc8c416e430a1fd824626b259dab5f6
Component: engine
 2016-09-23 09:52:05 +08:00
Madhu Venugopal
e7ceeb1efb Merge pull request #26287 from msabansal/composefix 
Fixed support for docker compose by allowing connect/disconnect on stopped containers
Upstream-commit: 9896fa356c39faafb79ce2efe3550d498eb5d1fa
Component: engine
 2016-09-22 18:09:51 -07:00
John Starks
5c56a3d561 Windows: Back up files mutated during layer import 
The Windows BCD store for the utility VM is mutated during layer import,
which causes failures in docker save. Back up the BCD store and related
log files so that save has access to their original contents.

Fixes #25893.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 9c79b0efc02c6452cb9521faa466dcc118a0e433
Component: engine
 2016-09-22 17:44:38 -07:00
Brian Goff
d8c41a1861 Merge pull request #26814 from p4l1ly/master 
overlayfs added to FsNames
Upstream-commit: 5fa48f2e406b3979cda9bd3b29f77bf68fe9e61b
Component: engine
 2016-09-22 16:26:46 -04:00
msabansal
6bf922c44e Changes required to support windows service discovery 
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: d1e0a78614d4efa768c88c9db3868bc9e7782efc
Component: engine
 2016-09-22 12:21:21 -07:00
John Howard
debe74e333 Windows OCI: Remove endpoint list 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 410a8612f481e67265ce0edaf78ed1d96f6dffcf
Component: engine
 2016-09-22 10:08:13 -07:00
Michael Crosby
7195c6a9d6 Merge pull request #26746 from Microsoft/jjh/hvruntime 
Windows: OCI HVRuntime and LayerPaths to options
Upstream-commit: 3990f2816250cba4d48a867eccdc86712d0990b2
Component: engine
 2016-09-22 09:55:58 -07:00
Pavol Vargovcik
d36b90b866 overlayfs added to FsNames 
Signed-off-by: Pavol Vargovcik <pallly.vargovcik@gmail.com>
Upstream-commit: fe5c91c388e2cd98720a6804b7c637cb21870933
Component: engine
 2016-09-22 14:35:40 +02:00
Vincent Demeester
6b6c0bf977 Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers 
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
 2016-09-22 09:39:27 +02:00
Michael Crosby
894b99ac52 Merge pull request #26756 from rhvgoyal/init-rw-layer 
layer_store: Use CreateReadWrite() for -init layer instead of Create()
Upstream-commit: d2bc5d62761c24866e4b0ff4099dd54264bd9325
Component: engine
 2016-09-21 15:45:06 -07:00
msabansal
51c529dd35 Fixed support for docker compose by allowing connect/disconnect on stopped containers 
Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: 50f02b585c6e5866cf458c7f91a2e99e82ea9a2d
Component: engine
 2016-09-21 13:29:17 -07:00
Vivek Goyal
952f960124 layer_store: Use CreateReadWrite() for -init layer instead of Create() 
init layer is read/write layer and not read only layer. Following commit
introduced new graph driver method CreateReadWrite.

ef5bfad Adding readOnly parameter to graphdriver Create method

So far only windows seem to be differentiating between above two methods.
Making this change to make sure -init layer calls right method so that
we don't have surprises in future.

Windows does not need init layer. This patch also gets rid of creation of
init layer on windows.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 2508ca000e79dfe1a956b0078a0d196dd6b66dab
Component: engine
 2016-09-21 14:45:25 -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
7c1d86c305 Removed engine-api leftovers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
 2016-09-21 12:36:52 +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
John Howard
f621a80cd1 Windows: OCI HVRuntime and LayerPaths to options 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3aceeac50f35e2b10323087b2a1f21af45ee143
Component: engine
 2016-09-20 13:51:53 -07: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
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
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
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
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
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
Anusha Ragunathan
3da980e801 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>
Upstream-commit: b15264004d08ea86a12b675b1d6206cbbc90e44c
Component: engine
 2016-09-19 14:40:45 -07:00
Sebastiaan van Stijn
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
Darren Stahl
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
John Howard
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
John Howard
454fb85f2d Windows: OCI aggressive namespacing 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c89db6c044963c626a5240ef27078b2c4616d1ae
Component: engine
 2016-09-19 10:23:11 -07:00
John Howard
8abf4dbc45 Windows: Remove osversion from OCI 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 72de562943a9bfbc44d24c80dfc9d0dc112ab0f4
Component: engine
 2016-09-19 10:16:15 -07:00
Tõnis Tiigi
aa8b9ee0c3 Merge pull request #26577 from Microsoft/jjh/fstabmount 
Windows: Move to fstab options as per OCI
Upstream-commit: b72c7f74a616a52a52843cf5b295962845be3ba3
Component: engine
 2016-09-19 10:13:46 -07:00
Brian Goff
2a72633153 Merge pull request #26616 from tonistiigi/id-digest 
Generalize content addressable and reference storage
Upstream-commit: 45a8f680263558657e98c899204a632153b60cde
Component: engine
 2016-09-18 09:40:16 -04:00
Brian Goff
9a39a676da Merge pull request #26650 from Microsoft/jjh/firststart 
Windows: OCI remove first start
Upstream-commit: bc60f5af847d7ae7b466ecca7fc58a9345ee1084
Component: engine
 2016-09-18 09:27:10 -04:00
Brian Goff
efff8ce2a3 Merge pull request #26578 from Microsoft/jjh/ociuser 
Windows: Unify OCI user struct
Upstream-commit: 112ba3637da812d4bbfd2095cd71c345eabc1500
Component: engine
 2016-09-18 09:20:45 -04:00
John Howard
d5426f0e52 Windows: Remove TP5 hack from graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f61315f0df480b261a70278360b08f32c991d3ef
Component: engine
 2016-09-17 16:16:50 -07:00
John Howard
5049c43226 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
 2016-09-17 09:31:24 -07:00
Vincent Demeester
301b810036 Merge pull request #26656 from miaoyq/rename-name-to-destination 
Rename the variable 'name' to 'destination'
Upstream-commit: e54171378c7e7e17738a48e9ef768bbe337d0c28
Component: engine
 2016-09-17 16:01:02 +02:00
Vincent Demeester
66c468a968 Merge pull request #26606 from dnephin/move_errors 
Move errors package to api/errors
Upstream-commit: 5d7b725071a7cc7c994f2f7f6a29352790f5096a
Component: engine
 2016-09-17 16:00:38 +02:00
Vincent Demeester
19194e282c Merge pull request #26643 from allencloud/validate-two-service-modes-in-request 
return err when both two service modes in request
Upstream-commit: 1d8ad2974eb7dfe4f6f48c5fee28efa89cf6821f
Component: engine
 2016-09-17 15:50:55 +02:00
Brian Goff
b82751259c Merge pull request #26555 from miaoyq/refactor-aufsMount 
refactor the function 'aufsMount' in 'daemon/graphdriver/aufs/aufs.go'
Upstream-commit: 354835695730c32a3c2374d2453d3cdf73bf4ee0
Component: engine
 2016-09-17 08:04:18 -04:00
allencloud
a4d4b2606e return err when both two service mode in request 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c413d4177b9621d6bcfd24c9b7118887ad378c49
Component: engine
 2016-09-17 19:04:46 +08:00