Commit Graph

2360 Commits

Author SHA1 Message Date
8a19fb43a4 Merge pull request #26941 from runcom/docker-init-path-1
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
2016-09-28 13:12:59 +02:00
be83d1256c Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
4ab44ced86 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
195692ee1c configure docker-init binary path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
2016-09-27 14:49:17 +02:00
562ec15f92 Let swarmkit handle cluster defaults in swarm init if not specified
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
672761b64e make client side know container removal in progress
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
67175b8b48 Merge pull request #24634 from thaJeztah/make-network-name-required
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00
f6a08edcd6 Merge pull request #26885 from allencloud/add-swarm-types-comments-and-fix-nits
add swarm type comments and fix nits
Upstream-commit: 373d3200c257fe80ec4da1f260dc69297b31e87c
Component: engine
2016-09-26 22:33:24 +01:00
6352e3e776 API return network-list if no network-name or id is provided
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.

This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).

Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
2016-09-26 21:44:34 +02:00
356aff7cd8 Merge pull request #26839 from tonistiigi/build-cache
Implement build cache based on history array
Upstream-commit: 7944480dd0dfb00323f960d37c31d0ddad5f6cf2
Component: engine
2016-09-26 17:31:49 +00:00
d4b8261601 add swarm type comments and fix nits
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c1925ce34606d45f9d3b1433867a697414124d14
Component: engine
2016-09-26 17:17:52 +08:00
d8e01f6cf0 display no id in log when service creating fails
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6ae8c83ebe253104e9471aaa6e80c5acf24b1d9e
Component: engine
2016-09-26 16:23:28 +08:00
a034d841ce Add isolation to info
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c4e169727474f24cb0eddea15b94aaa2bfbb3281
Component: engine
2016-09-23 12:13:29 -07:00
cc3c0d322a Implement build cache based on history array
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
Upstream-commit: 690882c2e79c3f3742c709cf158584e61594ba00
Component: engine
2016-09-23 11:30:06 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
0529a1ae57 Added comments to PortConfig for greater clarity
I always forget which one is which. Now, I can't forget. This is
probably in the docs somewhere but now it's handy at a glance.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 55454752f825a5ec033ca072350a77a928afd6ac
Component: engine
2016-09-16 14:47:35 -07:00
7342ae40e2 Windows: stats support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
e90292dd20 Use apiError in server version middleware.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bcb0405239e0c820516b05ccc2bb7e8d4a1599f9
Component: engine
2016-09-16 12:27:14 -04:00
d47b1c8a71 Move errors/ to api/errors
Using:
        gomvpkg -from github.com/docker/docker/errors
                -to github.com/docker/docker/api/errors
                -vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c452e1bfe6b19d44bf2ed2a1eb8aef7e23d6bafb
Component: engine
2016-09-16 12:27:13 -04:00
982e83123e Fix the clashing route syntax for checkpoint/container delete.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 0dfbf960d72fc3f7deec02cc3f36385361216794
Component: engine
2016-09-08 21:31:56 -04:00
7bef93723c Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
2016-09-08 21:31:52 -04:00
d8acc366ce Move api/client -> cli/command
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
2016-09-08 15:46:29 -04:00
0b990a4b09 Merge pull request #26107 from dnephin/client_cleanup
Shrink the DockerCLI type
Upstream-commit: d959e7fac4345762d26083a5d694871377f6dc75
Component: engine
2016-09-08 12:18:46 -07:00
574f281ca0 Merge pull request #26224 from q384566678/test-zhou
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
2016-09-08 11:22:21 -07:00
14da2ebf2c Move holdHijackConnection to the container package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6af6a3a5383642d2d7c3784f0f4e562dc324819a
Component: engine
2016-09-08 12:58:06 -04:00
f861cad6dd Move container util methods to the container package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 31d8c27e704c9dd06ba3a0cccb7427054d9e6ccd
Component: engine
2016-09-08 12:38:52 -04:00
bb1ed52ac8 Extract input stream into a new type.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bec81075bf1ae07abcbf3f984922dedb10458cb2
Component: engine
2016-09-08 12:34:55 -04:00
e0295afbc4 Extract stream output handling to a new type.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a0ab33124a52853af611254cd73838e3d4407f51
Component: engine
2016-09-08 12:33:41 -04:00
f0d30a4b26 Add support for docker run in swarm mode overlay
This PR adds support for running regular containers to be connected to
swarm mode multi-host network so that:
    - containers connected to the same network across the cluster can
      discover and connect to each other.
    - Get access to services(and their associated loadbalancers)
      connected to the same network

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99a98ccc14a9427be47c8006e130750710db0a16
Component: engine
2016-09-07 21:20:41 -07:00
60a22c207c Move engine-api client package
This moves the engine-api client package to `/docker/docker/client`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7c36a1af031b510cd990cf488ee5998a3efb450f
Component: engine
2016-09-07 11:05:58 -07:00
45ddc4bfcb Add engine-api types to docker
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
2016-09-07 11:05:58 -07:00
19d0c0f4d5 Merge pull request #23100 from runcom/fix-stores
support legacy registries in exernal stores
Upstream-commit: 86124ca04b4b0ff4096ca95626e7864692edeadf
Component: engine
2016-09-07 09:44:41 -07:00
03938c05b0 Merge pull request #26115 from yongtang/08292016-info-registry-mirrors
Add registry mirrors information in the output of `docker info`
Upstream-commit: 6168e98a13ee4d226fe96c5afbe672065ddf2c8e
Component: engine
2016-09-07 11:37:36 -04:00
a8af3835c4 Merge pull request #26269 from yuexiao-wang/remove-option
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
2016-09-07 11:31:11 -04:00
4eb86a788b support legacy registries in exernal stores
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 67d752ac55869eab42280947ad37ff5e1468d458
Component: engine
2016-09-07 09:45:42 +02:00
7321b93433 api/client/node: correct ordering in context argument
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 084ff6dc6da4458e8ca0e4fffa9d133a5d39ee92
Component: engine
2016-09-06 17:04:43 -07:00
392f4993c4 Merge pull request #26282 from mstanleyjones/26280_fix_pretty_print
`docker node inspect <node> --pretty`  needs an extra newline at the end
Upstream-commit: 5c6b54c278e9639e7b21908315ff986ac812d4fe
Component: engine
2016-09-06 16:04:55 +02:00
bf0c3d33a0 correct docker volume ls subcommand description
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 2087f94df57473f553972236c9a5e63fb694a664
Component: engine
2016-09-06 17:18:41 +08:00
c53f181a9b Fix incorrect help output in docker network ls
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
2016-09-05 08:24:22 -07:00