Victor Vieux
0427afa409
Merge pull request #27955 from mlaventure/runc-docker-info
...
Add external binaries version to docker info
2016-11-10 21:27:14 -08:00
Tõnis Tiigi
48a0c3e831
Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
...
Fix registry authorization errors
2016-11-10 19:39:28 -08:00
Tõnis Tiigi
a5da9f5cc9
Merge pull request #27917 from mrjana/ports
...
Add support for host port PublishMode in services
2016-11-10 19:38:54 -08:00
Tõnis Tiigi
1229105582
Merge pull request #28265 from aaronlehmann/dont-repull-digest
...
executor: Don't repull image if pinned by digest
2016-11-10 19:19:31 -08:00
yuexiao-wang
8e04bc5572
Add --with-registry-auth for stack deploy
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-11 11:01:31 +08:00
Victor Vieux
82130b725d
Merge pull request #28277 from datawolf/small-fix
...
Use '.' directly
2016-11-10 19:00:21 -08:00
Victor Vieux
4453fd22a7
Merge pull request #28217 from Microsoft/jjh/373engineapifollowup
...
Tidy GetDockerOS() function
2016-11-10 18:57:56 -08:00
Wang Long
2b7f7e9aff
Use '.' directly
...
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-11-11 10:22:32 +08:00
Brian Goff
bd78374618
Merge pull request #28276 from lixiaobing10051267/masterSwarmRouter
...
rectify type defination for swarmRouter
2016-11-10 21:16:31 -05:00
lixiaobing10051267
ac5d86a672
rectify type defination for swarmRouter
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-11 10:45:48 +08:00
Jana Radhakrishnan
14ac9f60d0
Add support for host port PublishMode in services
...
Add api/cli support for adding host port PublishMode in services.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-11-10 18:07:55 -08:00
Victor Vieux
750d634d62
Merge pull request #27998 from dnephin/compose-on-swarm
...
Support `docker stack deploy` from a Compose file
2016-11-10 17:59:57 -08:00
Lei Jitang
891e03eb7d
Merge pull request #28231 from yuexiao-wang/container-exec
...
Remove redundant parameter and fix typos
2016-11-11 09:55:42 +08:00
John Howard
46ec4c1ae2
Windows: create daemon root with ACL
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-10 17:51:28 -08:00
Derek McGowan
19a93a6e3d
Update pull error handling
...
Translate pull errors to provide a more consistent and user friendly
error message.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Derek McGowan
c85eb00841
Update for distribution vendor
...
Handle updates to reference package.
Updates for refactoring of challenge manager.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Derek McGowan
60ecc132c5
Update distribution vendor
...
Pull in client changes to handle oauth errors
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Victor Vieux
acd6e0d9b2
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
2016-11-10 17:30:54 -08:00
Tõnis Tiigi
d54f4472fd
Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
...
Fix failure to get containers when deleting a layer
2016-11-10 17:10:05 -08:00
Tõnis Tiigi
7aeacd35f2
Merge pull request #28238 from ijc25/jsonmessage-urxvt-corruption
...
pkg/jsonmessage: Avoid undefined ANSI escape codes.
2016-11-10 17:07:01 -08:00
Victor Vieux
bed96ce922
Merge pull request #28031 from yongtang/27902-extra-hosts
...
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
2016-11-10 16:55:29 -08:00
Victor Vieux
813f86697f
Merge pull request #28271 from andrewhsu/fix-opensuse
...
replace vim-common with vim for opensuse
2016-11-10 16:52:30 -08:00
John Howard
29b7a73792
Merge pull request #28268 from Microsoft/jjh/clientcheck
...
Windows: Additional client check
2016-11-10 16:11:44 -08:00
Victor Vieux
970b23db2e
update media_type
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Victor Vieux
c410222e42
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
John Howard
1e592349f1
Merge pull request #28228 from tonistiigi/swarm-cert-expired
...
Start daemon if certificates have been expired
2016-11-10 15:50:36 -08:00
Andrew Hsu
5764171fe7
replace vim-common with vim for opensuse
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-11-10 15:50:29 -08:00
Aaron Lehmann
5d1feb561f
Merge pull request #28221 from aboch/ala
...
Add local address autodetection on swarm init
2016-11-10 15:45:59 -08:00
Vincent Demeester
f3f9b3dac9
Merge pull request #28264 from dmcgowan/fix-overlay2-naivediff-unittest
...
Skip overlay2 diff tests when using naivediff
2016-11-11 00:24:06 +01:00
Andrea Luzzardi
5f9fe54b35
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
2016-11-10 15:13:41 -08:00
Aaron Lehmann
f69e5c18ac
executor: Don't repull image if pinned by digest
...
If the image reference in the spec uses a digest, and an image with that
digest already exists locally, avoid an unnecessary repull.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-10 14:45:54 -08:00
John Howard
6b4ad8d6f5
Windows: Additional client check
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-10 14:35:19 -08:00
Vincent Demeester
f87e6eb830
Merge pull request #28261 from Microsoft/jjh/dockerfile
...
Windows: Dockerfile Win 10 client note
2016-11-10 23:28:03 +01:00
Tonis Tiigi
439de7694d
Start daemon if certificates have been expired
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-10 14:11:53 -08:00
Darren Stahl
d4095a5902
Fix failure to get containers when deleting a layer
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-10 14:07:11 -08:00
Darren Stahl
d0e1949d22
Vendor update hcsshim to v0.5.8
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-10 14:06:57 -08:00
Victor Vieux
f700a86dc0
Merge pull request #28257 from sanimej/iptables
...
vendor libnetwork @1861587
2016-11-10 14:01:02 -08:00
Victor Vieux
0151fb7618
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
2016-11-10 13:59:46 -08:00
Tonis Tiigi
fc21fcc90e
Fix flaky TestServiceUpdateSecrets
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-10 13:59:28 -08:00
Victor Vieux
f1f3c4cc87
Merge pull request #28222 from thaJeztah/add-fedora-25
...
Add Fedora 25 RPMs
2016-11-10 13:57:41 -08:00
Derek McGowan
5a1b557281
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)
2016-11-10 13:52:22 -08:00
Kenfe-Mickaël Laventure
f3864bcd34
Merge pull request #27116 from cpuguy83/22564_fix_volume_unmount
...
Fix uneccessary calls to `volume.Unmount()`
2016-11-10 13:48:44 -08:00
Victor Vieux
a81385b0cb
Merge pull request #28192 from allencloud/fix-docs-issue-on-service-ls-api
...
change node ls and service ls api and docs
2016-11-10 13:46:35 -08:00
Andrea Luzzardi
97e4bff6b2
service logs reference documentation
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 13:46:03 -08:00
Andrea Luzzardi
c7995fdc77
cli: docker service logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 13:46:02 -08:00
Andrea Luzzardi
819d0159bb
api: Service Logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 13:46:02 -08:00
Alessandro Boch
c8d0cb9e71
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>
2016-11-10 13:45:32 -08:00
Aaron Lehmann
2161f35672
Merge pull request #28251 from cyli/re-vendor-swarmkit
...
Vendor the latest swarmkit
2016-11-10 13:28:31 -08:00
Michael Crosby
801230ce31
Merge pull request #27797 from vdemeester/stats-format-names-support
...
Add support for Names and ID in stats format
2016-11-10 13:26:00 -08:00
Victor Vieux
fa7c1a68a6
Merge pull request #28043 from vieux/plugin_set_gogogo_continue
...
support mounts,devices and args for docker plugin set
2016-11-10 13:24:02 -08:00