ce9a44097a
Merge pull request #28268 from Microsoft/jjh/clientcheck
...
Windows: Additional client check
Upstream-commit: 29b7a737925d05f3fb46db97ae64661c6e9f3a31
Component: engine
2016-11-10 16:11:44 -08:00
87b507f694
Merge pull request #28228 from tonistiigi/swarm-cert-expired
...
Start daemon if certificates have been expired
Upstream-commit: 1e592349f192d020b14372f4d3c21cd3a7c8bd9a
Component: engine
2016-11-10 15:50:36 -08:00
4cf2d87976
Merge pull request #28221 from aboch/ala
...
Add local address autodetection on swarm init
Upstream-commit: 5d1feb561f1f8b402b5c77b2f27f3d571bd2b226
Component: engine
2016-11-10 15:45:59 -08:00
f4dd1c6a23
Merge pull request #28264 from dmcgowan/fix-overlay2-naivediff-unittest
...
Skip overlay2 diff tests when using naivediff
Upstream-commit: f3f9b3dac9114cfe0f8bf0380dd7343cc58d3a1c
Component: engine
2016-11-11 00:24:06 +01:00
0d1faa11e0
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
2016-11-10 15:13:41 -08:00
8dbcc088be
Windows: Additional client check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b4ad8d6f51f43711846945e2dd8ad40d7020b53
Component: engine
2016-11-10 14:35:19 -08:00
a99fd733ad
Merge pull request #28261 from Microsoft/jjh/dockerfile
...
Windows: Dockerfile Win 10 client note
Upstream-commit: f87e6eb8305627e984f3d72c43837a833cc6de42
Component: engine
2016-11-10 23:28:03 +01:00
b55a4aaec7
Start daemon if certificates have been expired
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 439de7694d67eede9867aae12f304772962bffcd
Component: engine
2016-11-10 14:11:53 -08:00
b8314489b1
Merge pull request #28257 from sanimej/iptables
...
vendor libnetwork @1861587
Upstream-commit: f700a86dc01ef65061a695cc8e0694afaff8b334
Component: engine
2016-11-10 14:01:02 -08:00
510a237f2b
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
Upstream-commit: 0151fb7618ee7cd0bb7de213c604257cf5e3dc92
Component: engine
2016-11-10 13:59:46 -08:00
c051f7673e
Merge pull request #28222 from thaJeztah/add-fedora-25
...
Add Fedora 25 RPMs
Upstream-commit: f1f3c4cc87ad10963cad36dffa3c39b65325f301
Component: engine
2016-11-10 13:57:41 -08:00
17c10a9402
Skip overlay2 diff tests when using naivediff
...
Naivediff fails when layers are created directly on top of
each other. Other graphdrivers which use naivediff already
skip these tests. Until naivediff is fixed, skip with overlay2
when running tests on a kernel which causes naivediff fallback.
Fix applydiff to never use the naivediff size when not applying
changes with naivediff.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 5a1b557281204964f37e81cb0776758360029555
Component: engine
2016-11-10 13:52:22 -08:00
1039b39798
Merge pull request #27116 from cpuguy83/22564_fix_volume_unmount
...
Fix uneccessary calls to `volume.Unmount()`
Upstream-commit: f3864bcd3406c963395f6de9cdc7172c0daa1f5d
Component: engine
2016-11-10 13:48:44 -08:00
fad8660a66
Merge pull request #28192 from allencloud/fix-docs-issue-on-service-ls-api
...
change node ls and service ls api and docs
Upstream-commit: a81385b0cb7045dfdc7302ed4144a0243e464d0b
Component: engine
2016-11-10 13:46:35 -08:00
9de0bed2e4
service logs reference documentation
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 97e4bff6b2035f24306f41ef83eb4d79e53d354b
Component: engine
2016-11-10 13:46:03 -08:00
050cbb7ecd
cli: docker service logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: c7995fdc7760c23cdbed0fa4ca229517c71dba82
Component: engine
2016-11-10 13:46:02 -08:00
4d22d82151
api: Service Logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 819d0159bbda1b3ae53bdaa9a3e62ac98497e24c
Component: engine
2016-11-10 13:46:02 -08:00
2e628cd947
Add local address autodetection on swarm init
...
- when advertise-addr is not local and listen-addr is
not specified
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: c8d0cb9e716585f33dc730911332adbbc458513a
Component: engine
2016-11-10 13:45:32 -08:00
5387bf18d8
Merge pull request #28251 from cyli/re-vendor-swarmkit
...
Vendor the latest swarmkit
Upstream-commit: 2161f35672047d1b621bb51f25850ba5d1405702
Component: engine
2016-11-10 13:28:31 -08:00
ef501816c9
Merge pull request #27797 from vdemeester/stats-format-names-support
...
Add support for Names and ID in stats format
Upstream-commit: 801230ce315ef51425da53cc5712eb6063deee95
Component: engine
2016-11-10 13:26:00 -08:00
6f1d87061d
Merge pull request #28043 from vieux/plugin_set_gogogo_continue
...
support mounts,devices and args for docker plugin set
Upstream-commit: fa7c1a68a68ffb7c6851c59d2c0b41091b9d6e5e
Component: engine
2016-11-10 13:24:02 -08:00
881cd023ce
Merge pull request #27753 from tonistiigi/fix-overlay-unmount
...
Fix overlay unmount for the root case
Upstream-commit: 1883b73a573fff613f944bb83e24db14d839902c
Component: engine
2016-11-10 13:14:45 -08:00
081f2ffa6c
Merge pull request #28259 from sdurrheimer/zsh-completion-node-rm-swarm-leave-force
...
Add zsh completion for 'docker {node rm,swarm leave} -f'
Upstream-commit: b24a833f816ecd59fa733c94657efe56fd913777
Component: engine
2016-11-10 21:52:18 +01:00
b550de0a42
Merge pull request #28255 from sdurrheimer/zsh-completion-dockerd-seccomp-profile
...
Add zsh completion for 'docker daemon --seccomp-profile'
Upstream-commit: 93591faeb5bcf3e31ce65dfa58e825f72c6e5489
Component: engine
2016-11-10 21:51:29 +01:00
6b9d29433b
Merge pull request #28256 from sdurrheimer/zsh-completion-service-create-update-tty
...
Add zsh completion for 'docker service {create,update} --tty'
Upstream-commit: 8aa04807adcc26bd6dea26c9a1ce284c73d175b7
Component: engine
2016-11-10 21:50:29 +01:00
1193760855
Merge pull request #28252 from sdurrheimer/zsh-completion-service-create-hostname
...
Add zsh completion for 'docker service create --hostname'
Upstream-commit: c51b16f0e4081d1270cfe28887f87a0d5a5a6859
Component: engine
2016-11-10 21:49:02 +01:00
8afc09fa08
Windows: Dockerfile Win 10 client note
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f6ecfd620a48751124d3d1e590e9e83a437996ca
Component: engine
2016-11-10 12:45:56 -08:00
6ff10b10a9
Add zsh completion for 'docker {node rm,swarm leave} -f'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 04e7fca6203287fbf2790acb4886af46f188543e
Component: engine
2016-11-10 21:31:34 +01:00
b67d7eab26
Add zsh completion for 'docker service {create,update} --tty'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a34a41b20b9b5849ddd316b11935c6c2754fd253
Component: engine
2016-11-10 21:25:24 +01:00
6ecbb91f43
Add zsh completion for 'docker daemon --seccomp-profile'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0f324a5b154baeafef730f62d779da14c54ef8db
Component: engine
2016-11-10 21:21:25 +01:00
5c80e344d2
Merge pull request #28254 from sdurrheimer/zsh-completion-container-create-run-cpus
...
Add zsh completion for 'docker {run,create} --cpus'
Upstream-commit: a851cad25cd45b6d7f528210b6800ebb90d0866f
Component: engine
2016-11-10 15:16:19 -05:00
3ae73e8162
Merge pull request #28250 from sdurrheimer/zsh-completion-prune
...
Add zsh completion for new prune commands
Upstream-commit: 47dd8c7cc6fdcb158f5b6a8de230822942743076
Component: engine
2016-11-10 12:11:26 -08:00
84c24899c1
Add zsh completion for 'docker {run,create} --cpus'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 9b02c87f7bcb49396258e45c0487dce4a94661fc
Component: engine
2016-11-10 21:10:22 +01:00
9ee3779eb4
cli: Change autolock flag description
...
This change incorporates feedback from @thaJeztah in the PR that added
the autolock flag. It changes the descriptions to be different for
"swarm init" and "swarm update" so that the boolean nature so that the
purpose of the flag in both contexts is clearer.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 41b84e0994f9ec72990b7f0fc758f602f6241bc6
Component: engine
2016-11-10 12:05:19 -08:00
8c6719d015
vendor libnetwork @1861587
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 90bc2756ed2693ff26f0517abbb060626d9a7284
Component: engine
2016-11-10 12:04:28 -08:00
e93ab8dcb4
cluster executor: Logs retrieving support.
...
Plumbed the executor to the container logs backend.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 0ec68657139f029e2740780a58e0019df0e42b6a
Component: engine
2016-11-10 12:02:47 -08:00
32e8919fe3
Add zsh completion for 'docker service create --hostname'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ca654a417a27f72edc99e02d75d9602a9698f6e3
Component: engine
2016-11-10 21:00:17 +01:00
1bc2b60fd4
update swagger and docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: aef1dec9a6dbf1dcf4b43417c3c5fafda2ede957
Component: engine
2016-11-10 11:58:15 -08:00
a5ddd33ae3
support mounts, devices and args for docker plugin set
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: fc7a2652588ed30e3b3a10ab72329e82f0440236
Component: engine
2016-11-10 11:55:48 -08:00
e2a7e2f897
Vendor the latest swarmkit PR
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: b399d29a57dad9c9fe14bf07431eb57a9ef0d2ac
Component: engine
2016-11-10 11:53:02 -08:00
fb791c891a
Add zsh completion for new prune commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 712445607d5c5e03ea39bd9c6403104565a0d342
Component: engine
2016-11-10 20:51:44 +01:00
64ff7ea1bd
Merge pull request #28223 from bfirsh/update-swagger
...
Update swagger.yaml with recent API changes
Upstream-commit: a2937b201377f01ce5871de91b5943e0c369e5f8
Component: engine
2016-11-10 20:49:55 +01:00
3c13ce07e7
Fix an issue in the swarm unlock-key rotate test where we were never updating the
...
previous generation unlock key.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 81f3e699c30fe412de0fa48dfa2885181f5d5002
Component: engine
2016-11-10 11:48:39 -08:00
949cb1d2cb
Add Fedora 25 RPMs
...
This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.
Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule
Once released, the image will be updated for
GA
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c4f1cb779179b6145702174614706c462a5ceaae
Component: engine
2016-11-10 20:44:30 +01:00
4e58c5cd9f
Merge pull request #28182 from msabansal/overlayexternal
...
Swarm-mode overlay networking support for windows
Upstream-commit: 4705728b41db6f0951564e48d573f439a092bd63
Component: engine
2016-11-10 20:42:51 +01:00
3c72f5dda6
Add zsh completion for 'docker system' subcommands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 9df7cdcb2e6e169e0d41458bf86e02203a4fe0cd
Component: engine
2016-11-10 20:17:58 +01:00
1689aa276d
Fix uneccessary calls to volume.Unmount()
...
Fixes #22564
When an error occurs on mount, there should not be any call later to
unmount. This can throw off refcounting in the underlying driver
unexpectedly.
Consider these two cases:
```
$ docker run -v foo:/bar busybox true
```
```
$ docker run -v foo:/bar -w /foo busybox true
```
In the first case, if mounting `foo` fails, the volume driver will not
get a call to unmount (this is the incorrect behavior).
In the second case, the volume driver will not get a call to unmount
(correct behavior).
This occurs because in the first case, `/bar` does not exist in the
container, and as such there is no call to `volume.Mount()` during the
`create` phase. It will error out during the `start` phase.
In the second case `/bar` is created before dealing with the volume
because of the `-w`. Because of this, when the volume is being setup
docker will try to copy the image path contents in the volume, in which
case it will attempt to mount the volume and fail. This happens during
the `create` phase. This makes it so the container will not be created
(or at least fully created) and the user gets the error on `create`
instead of `start`. The error handling is different in these two phases.
Changed to only send `unmount` if the volume is mounted.
While investigating the cause of the reported issue I found some odd
behavior in unmount calls so I've cleaned those up a bit here as well.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9a2d0bc3adc0c21c82cd1974be45ea0449f9f224
Component: engine
2016-11-10 14:04:08 -05:00
a2106ea21e
Merge pull request #28173 from nishanttotla/pin-images-by-digest
...
Pin images by digest
Upstream-commit: c13bf5ba51c4f6a1ba5e5c0da0d4f85d2d5b9116
Component: engine
2016-11-10 10:59:28 -08:00
e312e280e3
change node ls and service ls api and docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 48c3fcedfa95f7c12868b218bd831dac8e04864f
Component: engine
2016-11-11 02:51:19 +08:00
cd96217228
Merge pull request #28243 from andrewhsu/change-context
...
use "golang.org/x/net/context" instead of "context"
Upstream-commit: 02918908af98d95652668f015275747907e78c68
Component: engine
2016-11-10 19:13:56 +01:00
