2b291d4bab
Do not panic if network is nil
...
network is `nil` if the following case:
```
services:
foo:
image: nginx
networks:
mynetwork:
```
It's a valid compose so we should not panic.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 158388ef8d66723ec1f8ee4770d7488948234d16
Component: engine
2016-11-21 17:59:29 +01:00
a4b2e09289
Merge pull request #28539 from nishanttotla/pin-image-digest-ux
...
Suppressing digest for docker service ls/ps
Upstream-commit: 278e01d6de56e7ffb6f47db9dfca8fdb196a9643
Component: engine
2016-11-21 14:06:37 +01:00
65878dd980
Merge pull request #28648 from YuPengZTE/devBareURL
...
fix the mistak of url format
Upstream-commit: 5c6e649fdecb0eb12a7f077b7dbfb3fe7c851123
Component: engine
2016-11-21 11:03:43 +01:00
86d2b2a2e1
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 3739c3bed37a3493a20bff3c9abb17561e1a732d
Component: engine
2016-11-21 10:28:37 +01:00
55cdbbd2d1
Bare URL used
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 0655d5cd1f541fd13afc4c157f7e827ff2a30625
Component: engine
2016-11-21 16:30:09 +08:00
67a9711f50
Merge pull request #28644 from zhukj/daemon-config
...
close the file
Upstream-commit: 103f2e56bf753019a4013a2722f908a3ee1bc558
Component: engine
2016-11-21 13:50:26 +08:00
17bacb4a03
close the file
...
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn >
Upstream-commit: cf3ef262b161f1c3dd61f5689e2853c2e8ec8b70
Component: engine
2016-11-21 19:56:01 +08:00
4ee658f439
Merge pull request #28637 from albers/completion-dockerd--userland-proxy-path
...
Add bash completion for `dockerd --userland-proxy-path`
Upstream-commit: 897693480652defa809c5675121f7962b72c43bd
Component: engine
2016-11-21 13:48:10 +08:00
7b9d298769
Merge pull request #28026 from ripcurld00d/fix_27772
...
Return an empty stats if the container is restarting
Upstream-commit: baa14c0e615393dc3459436052d4d7fc513d7d9a
Component: engine
2016-11-20 21:14:37 +01:00
71a6f392dc
Add bash completion for dockerd --userland-proxy-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0d573a62f7e9b74621376cd5514462277bf341e9
Component: engine
2016-11-20 09:58:39 -08:00
46774960e2
Merge pull request #28607 from mstanleyjones/28133_iptables_false
...
Clarify that ipmasq rules are not added when iptables is false
Upstream-commit: 227af35a173c6b1d3b76f8423b8640553621924d
Component: engine
2016-11-20 17:35:31 +01:00
bca75d82a1
Merge pull request #28563 from darrenstahlmsft/ShutdownOnStop
...
Shutdown instead of terminate process on Windows
Upstream-commit: c8bf9336979d56f8cdb9576df981c04d06525f1e
Component: engine
2016-11-19 18:22:51 +01:00
0dc7ad5947
Merge pull request #28451 from Ghnuberath/master
...
Add HostConfig.Tmpfs to docs for container creation remote API
Upstream-commit: 2b680b15739a5128d2697c0401528d96f1de9107
Component: engine
2016-11-19 18:22:15 +01:00
40d5a75060
Merge pull request #28611 from vieux/fix_golint
...
fix a few golint errors
Upstream-commit: 96f50e9b7087bad25cb38e2985c26b509be0c403
Component: engine
2016-11-19 07:16:44 -05:00
a7e03990d9
Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded
...
Use Container.Config.Shell instead of hardcoded…
Upstream-commit: f6f67891be80f40a8f8dd0e9296d56b6882ecc2f
Component: engine
2016-11-18 18:54:36 -08:00
68a4c9aae2
Merge pull request #28524 from aluzzardi/experimental-routes
...
router: Return explicit error rather than 404 for experimental.
Upstream-commit: c3fab6d47345f0d79efd88d0ea0495dd70f0e9f5
Component: engine
2016-11-18 18:49:15 -08:00
8b39397a80
Merge pull request #28561 from vieux/poc_cmd_error_unsuported
...
error on cli when trying to use experimental feature with non experimental daemon
Upstream-commit: 0337822d34d95962ec5bbbab59a0e25e932e668b
Component: engine
2016-11-18 18:47:36 -08:00
efab471941
Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins
...
Allow graphdriver plugins to use v2
Upstream-commit: eb8fc5dcc3eecc9f645fae8194732747501398da
Component: engine
2016-11-18 18:45:34 -08:00
59c81c21bb
Merge pull request #28613 from vieux/fix_govet
...
skip api/types/container/ (like golint) and fix one pkg
Upstream-commit: ee6f3b67961fd83bbec662ee7558e8cc47f778a9
Component: engine
2016-11-18 18:35:37 -08:00
c148947fe6
fix a few golint errors
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
2016-11-18 18:32:02 -08:00
6038277781
skip api/types/container/ (like golint) and fix one pkg
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 79a891efb7365e4f7d129a0142e66d2852781608
Component: engine
2016-11-18 16:33:50 -08:00
c257bd40a6
Merge pull request #28599 from aluzzardi/revendor-swarmkit
...
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Upstream-commit: a0866bd679f3099815d44664f7f53d099c66d426
Component: engine
2016-11-18 16:23:54 -08:00
9d6cdfc19f
fix gofmt in master
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9f348d5625996faf7a0855b8eb52cdd4def3958e
Component: engine
2016-11-18 15:20:19 -08:00
861d75e8ee
Merge pull request #28603 from thaJeztah/flipping-hosts
...
swap position of "host" and "ip"
Upstream-commit: 8851e6ba70f8428f08a8c2cbcdad1b7532b55e43
Component: engine
2016-11-18 14:58:04 -08:00
4b5f254c7b
Clarify that ipmasq rules are not added when iptables is false
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: db3f06fd976d71a1d335278ecedf026aea6046c0
Component: engine
2016-11-18 14:25:24 -08:00
33ea65e4f5
Allow graphdriver plugins to use v2
...
Currently the plugin initialization is too late for a loaded v2 plugin
to be usable as a graph driver.
This moves the initialization up before we create the graph driver.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 020b051dfb92edcb1e43cee77c881dd3e15481c0
Component: engine
2016-11-18 17:23:59 -05:00
b5a2933b08
Merge pull request #28590 from mlaventure/update-containerd
...
Update containerd & runc
Upstream-commit: e67664887da4b9657ead8f8e39a6a6c3fe122c99
Component: engine
2016-11-18 14:08:56 -08:00
b72665f309
Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: e35c1747f5ebd36ba9d35ded5613e4e4762645d4
Component: engine
2016-11-18 13:32:26 -08:00
fd22b67295
swap position of "host" and "ip"
...
the service definition uses the format as defined
in http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])
This format is the _reverse_ of the format used in
the container API.
Commit f32869d956eb175f88fd0b16992d2377d8eae79c
inadvertently used the incorrect order.
This fixes the order, and correctly sets it to;
IP-Address hostname
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f1b9df91722a229fd0cefd7a0868933b6b811544
Component: engine
2016-11-18 22:04:27 +01:00
bee0ae1311
Shutdown instead of terminate process on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 8b503242734d66a223bf8d694f26901b1d02106d
Component: engine
2016-11-18 12:05:08 -08:00
3cb0023957
Add HostConfig.Tmpfs to docs for container creation remote API
...
Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca >
Upstream-commit: 2c38d43eb5276a82f8e076058506468e0d5a2f9f
Component: engine
2016-11-18 15:00:07 -05:00
71cdb489af
Merge pull request #28421 from aaronlehmann/digest-pinning-warnings
...
Return warnings from service create/update when digest pinning fails
Upstream-commit: 30d0c3899ef220e2a40f70e1e888a2d41fd7e7e8
Component: engine
2016-11-18 11:33:17 -08:00
5c4a8ff562
Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking
...
judge manager before unlocking
Upstream-commit: eb0fc787e699b20d884c8d0dc23a5392e5aeb1a8
Component: engine
2016-11-18 11:27:48 -08:00
4be5a5624f
Suppressing digest for docker service ls/ps
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: e7d83fdb9a17c384397e81d7b5a83245b4216f79
Component: engine
2016-11-18 09:39:34 -08:00
2efd6e2078
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
b58d62c699
Merge pull request #28577 from chchliang/defercode
...
function setupOOMScoreAdj file close illogicality
Upstream-commit: 06e92cc2c1e840095f2f11f576fe6097b0fc44af
Component: engine
2016-11-18 11:48:58 -05:00
5cab628042
Update containerd & runc
...
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8b1aeb22febdb60e29b4d1ee52c6d4139af1cd62
Component: engine
2016-11-18 08:15:20 -08:00
7534114314
judge manager before unlocking
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 972a246c671b52786a5e57743babfcf7b5b5ae99
Component: engine
2016-11-18 23:49:40 +08:00
6a67c61a99
Default parallelism to 1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7c1b39923505adeb13512d6294855b31102963a6
Component: engine
2016-11-18 16:17:08 +01:00
8b84a1af7f
Merge pull request #28586 from felipeweb/fix_infinite_recursion
...
fix infinite recursion
Upstream-commit: 8874f80e67c560f44322233bfc22ecd86b85e9e2
Component: engine
2016-11-18 06:44:52 -08:00
65faee61a6
Add support for healthcheck in composefile v3
...
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3bd64de7a9c3eecbd57cb11d861a6fe94a5bb788
Component: engine
2016-11-18 15:09:13 +01:00
9b29b94a3c
Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0903c9db0e1fe0226102e3887b5c30474837e97
Component: engine
2016-11-18 15:08:29 +01:00
5dd4a95cae
Merge pull request #28578 from allencloud/remove-redudant-file-Close
...
remove redundant file Close
Upstream-commit: c41ff780d818e7e663a51c8b3a3a67d7390b417d
Component: engine
2016-11-18 08:21:58 -05:00
9ea16716af
Merge pull request #28580 from allencloud/fix-nits-in-error-message
...
fix typos
Upstream-commit: b4e69fb3aa6d0def712c5df8dfac8395f86be608
Component: engine
2016-11-18 13:18:23 +00:00
d9813c8cd8
Merge pull request #28584 from justincormack/devpts-multiple-4.8
...
Fix check config script on 4.8 kernels
Upstream-commit: 3e31f3744ea8f915ffb27398abac3efbdadfb8f2
Component: engine
2016-11-18 08:18:08 -05:00
bc1922b24e
fix infinite recursion
...
Signed-off-by: Felipe Oliveira <felipeweb.programador@gmail.com >
Upstream-commit: 271b1f27563b18a125b89d2d2629246213dbfd96
Component: engine
2016-11-18 10:57:50 -02:00
c61cce0a3d
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
Upstream-commit: 6c447f552c84cfd1c2840f1f1d3061485aa69d10
Component: engine
2016-11-18 13:02:40 +01:00
6a727694ed
Fix check config script on 4.8 kernels
...
DEVPTS_MULTIPLE_INSTANCES is no longer an option, it is always set, so
do not check for this post 4.8.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 228ee16df3d738efaf001309370b26561c49edd6
Component: engine
2016-11-18 11:42:05 +00:00
fac3c72b9c
Merge pull request #28540 from lixiaobing10051267/masterNewContainerId
...
expected new_container_id while testing ContainerCommit
Upstream-commit: c0acfd1dadff10b3151699558232af7b7fc67718
Component: engine
2016-11-18 12:13:30 +01:00
c2c8a860a9
Merge pull request #28565 from crosbymichael/cputime
...
Fix cfs period calculation
Upstream-commit: 9e43a68f697832cd895cf8c512d3f7d497b3d0f5
Component: engine
2016-11-18 12:12:53 +01:00
