dccc4da522
hack/validate/vendor: add more checks
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 051b9a434f794ed67b5bfaf9dc9c4b0e6c46dd37
Component: engine
2017-02-16 07:43:03 +00:00
b3ec6dace6
Switch to new versioning scheme
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 47396d637781ef131fc47995756efff65ca1ccac
Component: engine
2017-02-15 23:22:50 -08:00
ee71506629
Fix cpu spin waiting for log write events
...
This loop is not ever going to return since it's never actually setting
the `err` var except on the first iteration.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7a179972ff963706404f91671960b144dec98d65
Component: engine
2017-02-15 21:41:32 -05:00
b4b0a816d9
overlay2: fix unmounting layer without merge dir
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e1af6c8a5767e38957449a1d07e56104e317191b
Component: engine
2017-02-15 17:58:12 -08:00
323be4fac1
Merge pull request #31056 from tonistiigi/build-cache-fix
...
Reset stdin config before running build actions
Upstream-commit: d26cf30a6094c22fd9d5a032faf96103f6f841dc
Component: engine
2017-02-15 18:02:57 -05:00
7cb213f3ce
Merge pull request #30416 from stevenh/linux-mount-fixes
...
Fix linux mount calls not applying propagation type changes
Upstream-commit: d52350d6623aa01bb846fc17ddbc209feafe1c14
Component: engine
2017-02-15 14:10:54 -08:00
d0f9d01ec6
Windows: Wait for OOBE to prevent crashing during host update
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: e128a65685dafd640e32118eb1903581489f7e31
Component: engine
2017-02-15 14:01:54 -08:00
2da555a6fc
Merge pull request #29819 from vdemeester/service-validate-publish-simple-syntax
...
Make sure we validate simple syntax on service commands
Upstream-commit: f18bc25fa1449ececeac3f8e4691934bd07abb75
Component: engine
2017-02-15 12:31:46 -08:00
be4d0dc6ad
Reset stdin config before running build actions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0f293f9eb31bdf8ff7adcb31baafca3f6fde3aab
Component: engine
2017-02-15 11:49:17 -08:00
8c67bb4bf9
Windows: Retry loop to fix HCS race condition enumerating containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This fixes https://github.com/docker/docker/issues/30278 where
there is a race condition in HCS for RS1 and RS2 builds, and enumeration
of compute systems can return access is denied if a silo is being
torn down in the kernel while HCS is attempting to enumerate them.
Upstream-commit: 83a2db20977ae41325a74cf871b9e3caa92a2b7b
Component: engine
2017-02-15 11:16:24 -08:00
32586ce540
Merge pull request #28638 from yongtang/28626-improve-error-handling
...
Improve error handling of experimental features in non-experimental mode
Upstream-commit: abe6a073c72107d54187d3bba4385c49d343366d
Component: engine
2017-02-15 11:00:03 -08:00
c7ba5add5f
Revendor Microsoft\hcsshim to v0.5.12
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9983a7b88f24b4cebdda1cfb1d5dd20fdd50820f
Component: engine
2017-02-15 10:16:16 -08:00
ec803a2e58
Merge pull request #30303 from allencloud/rewrite-reload
...
refactor config reload in daemon
Upstream-commit: ee560bd748d50f48ae421169542d14c8ea6dceac
Component: engine
2017-02-15 09:40:55 -08:00
cebed3ff8d
Merge pull request #29957 from ilianaw/amazonlinux-rpms
...
Build the docker-engine RPM for Amazon Linux
Upstream-commit: 3167bb8629a70728daaae3637ef9fa63273bb458
Component: engine
2017-02-15 09:40:03 -08:00
7ad266c66d
Merge pull request #31040 from BSWANG/master
...
fix docker stack omit external volume's "nocopy" parameter
Upstream-commit: 07aaa718067baef4250466bb86ec2dc5601325dd
Component: engine
2017-02-15 09:35:07 -08:00
c41889f3de
Update LICENSE date
...
Signed-off-by: Alihan Demir <alihan.demir.6153@gmail.com >
Upstream-commit: da028586e6dff255e69d2ab69efa428fc9884373
Component: engine
2017-02-15 17:34:33 +01:00
7f254e6829
Merge pull request #30861 from runcom/fix-plug-errcheck
...
plugin: check errors
Upstream-commit: ce0f9b5e10ca90687706a5168a6e251de4515fba
Component: engine
2017-02-15 07:50:27 -08:00
e7f7c8cfe0
Fix linux mount calls not applying propagation type changes
...
Propagation type changes must be done as a separate call, in the
same way as read only bind mounts.
To fix this:
1. Ensure propagation type change flags aren't included in other calls.
2. Apply propagation type change in a separate call.
Also:
* Make it clear which parameters are ignored by passing them as empty.
* Add tests to ensure Mount options are applied correctly.
Fixes #30415
Signed-off-by: Steven Hartland <steven.hartland@multiplay.co.uk >
Upstream-commit: b3b14b97b1087bfbce6a4de7039e17847fe491a2
Component: engine
2017-02-15 14:15:09 +00:00
3128024c49
rewrite reload code
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 75f5d63ec8414eb3d5f0a0707225b6fa7d485ce7
Component: engine
2017-02-15 21:57:27 +08:00
cf83a0af42
Merge pull request #30922 from dperny/fix-log-error-handling-return-error
...
Fix both logs commands to correctly handle errors
Upstream-commit: 946787e85e7c747c78354c5ca8d7a512b8766969
Component: engine
2017-02-15 08:41:42 -05:00
7ea1feeeaf
Merge pull request #30971 from dargor/allow_sync_file_range2
...
Allow sync_file_range2 on supported architectures.
Upstream-commit: 3b5ed562fc2b9a65b86a67dc88a9e44e95d7814c
Component: engine
2017-02-15 13:00:50 +00:00
a3ebb4bd61
fix docker stack volume's nocopy parameter
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com >
Upstream-commit: 4fe611958cc7d44a2a9d95ab892340349ed02072
Component: engine
2017-02-15 19:46:27 +08:00
b3755e4629
Merge pull request #31029 from BSWANG/master
...
fix docker daemon reload bug
Upstream-commit: ed003ffbe5b1f73af937c26ad106aab9da5148b9
Component: engine
2017-02-15 10:06:18 +01:00
5880452d53
Merge pull request #30832 from allencloud/update-swaggeryml-on-cluster-status-code
...
remove 400 and 404 for get nodes endpoint and add 503 for secret update
Upstream-commit: e8b92f154d68d17a09fa62ef8cd1b72163887c58
Component: engine
2017-02-15 09:45:44 +01:00
734f174687
plugin: check errors
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 3716dd227231046d4303f289bd31b9dde8168b26
Component: engine
2017-02-15 09:35:36 +01:00
f70682a575
Add zsh completion for docker log options 'max-buffer-size|mode'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba97d6be90f80d5dab6f2d0c89a0eef5b8307357
Component: engine
2017-02-15 08:49:13 +01:00
f78660f63c
Fixing #24631 , inspect output on swarm object types without labels is empty object {}
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 1b347cfc795407ced5eae60cb3ceadfdab8a8f4f
Component: engine
2017-02-15 01:25:55 -05:00
fea229adb1
[Docs] Add docs for stating stopped containers
...
This commit adds docs with example showing `docker stats` stopped
containers.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 7a36d55a86e5d443f1de5b7b32d710cc65671a92
Component: engine
2017-02-15 14:20:30 +08:00
347c5e8518
fix docker daemon reload bug
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com >
Upstream-commit: 51870c7e920cef10ecb19a8d8662bcf32da4b7c5
Component: engine
2017-02-15 10:58:09 +08:00
fe6344a73e
Fix some Liquid errors
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 2e19cc0cc463a4fd76e74b74a4efeb162f813c13
Component: engine
2017-02-14 16:40:15 -08:00
2315da980a
Merge pull request #30524 from mstanleyjones/30149_update_plugin_apidocs
...
Update plugin_volume apidocs for v2
Upstream-commit: 3dc87714d1bfcaf0620fabec3bfea89620b59337
Component: engine
2017-02-14 15:27:04 -08:00
f9c823322f
fix docker logs error handling
...
Previously, `docker logs` (and by extension, `docker service logs`) had
an error in the way they returned errors that occurred after a stream
had already been started. Specifically, the errors were added verbatim
to the HTTP response, which caused StdCopy to fail with an esoteric
error. This change updates StdCopy to accept errors from the source
stream and then return those errors when copying to the destination
stream.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: f19b0d72d1234c2bf4d85f7c1a4916b7b85b97b0
Component: engine
2017-02-14 14:38:42 -08:00
98a3d66460
Validate insecure registry (--insecure-registry) values
...
This fix is based on:
https://github.com/docker/docker/issues/29936#issuecomment-277494885
Currently the insecure registry is only checked to see if it contains
scheme (`http(s)://`) or not. No fully validation is done and this
caused many confusions like in #29936 .
This fix tries to address the issue.
This fix adds additional validation so that an insecure registry
is validated to make sure it is in `host:port` format where host
could be IPv4/IPv6 or a host name, and port could be an integer
between 0-65535.
Additional unit tests have been added.
This fix is related to #29936 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e49589505a9c543006f9a54a85917c3349b6ec5a
Component: engine
2017-02-14 13:13:23 -08:00
9e811ad5ef
Merge pull request #30921 from anusha-ragunathan/debug_docs
...
Add plugin socket related debug docs.
Upstream-commit: fddab1444f2c2f7e240a4bde10971ed84967767b
Component: engine
2017-02-14 13:10:23 -08:00
bfe4fc0207
Merge pull request #30873 from albers/completion-fix-start--checkpoint
...
Fix bash completion for `start --checkpoint`
Upstream-commit: e70227e6d20d7fa464eb2eaa1e6a760d641d6874
Component: engine
2017-02-14 16:00:15 -05:00
38136418f8
Merge pull request #30941 from sdurrheimer/zsh-completion-service-logs
...
Add zsh completion for 'docker service logs' command
Upstream-commit: 03db46362e5d913d5162e255ea5cff3d1fa73266
Component: engine
2017-02-14 15:59:19 -05:00
59db936767
Merge pull request #30943 from sdurrheimer/zsh-completion-checkpoint
...
Add zsh completion for 'docker checkpoint' commands
Upstream-commit: 4f6e4bfd0259331a840cdf06157389fce24f9457
Component: engine
2017-02-14 15:58:45 -05:00
8178464bb3
Merge pull request #30945 from sdurrheimer/zsh-completion-plugin
...
Add zsh completion for missing 'docker plugin' commands and options
Upstream-commit: da9a162301e36b7aa9a4925657f8c28121b11125
Component: engine
2017-02-14 15:57:25 -05:00
70ee4eca4e
Merge pull request #30952 from yongtang/02122017-swagger-attachable
...
Add `attachable` for network object in swagger api docs
Upstream-commit: 0464441fb152564f90340d4806b77ca7821aa1ef
Component: engine
2017-02-14 15:53:52 -05:00
4fb9ed21cb
Allow sync_file_range2 on supported architectures.
...
Signed-off-by: Gabriel Linder <linder.gabriel@gmail.com >
Upstream-commit: 52d8f582c331e35f7b841171a1c22e2d9bbfd0b8
Component: engine
2017-02-14 21:29:33 +01:00
06c085bc74
Add plugin socket related debug docs.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 6b8ae528655f65403c4d75d4bd9ce576cd26ff82
Component: engine
2017-02-14 12:13:48 -08:00
c619dbfa25
Vendoring libnetowrk @5537cb4
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5b6048fd6302550904e60e371c8aabaf6af346b1
Component: engine
2017-02-14 11:52:57 -08:00
d39118ab1f
Merge pull request #29702 from WeiZhang555/stats-all-format-name-panic
...
Send "Name" and "ID" when stating stopped containers
Upstream-commit: 22472c8be50ca0ddaf8207d46c6a9f5e792bd0af
Component: engine
2017-02-14 10:48:42 -08:00
1ca6b92e2e
Merge pull request #30396 from sdurrheimer/zsh-completion-hide-legacy-commands
...
Zsh completion hide legacy commands
Upstream-commit: 24523d9b75ebcea394cf1e678927e428fcfc407a
Component: engine
2017-02-14 19:42:25 +01:00
3a9737201b
Merge pull request #30985 from yongtang/29936-distribution-update
...
Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
Upstream-commit: 9042dbdb3b639182281fdc83f6d1f79b86b467bb
Component: engine
2017-02-14 12:25:57 +09:00
a532e48c46
fix the type
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: d735972d3150fa4e286ce468f033156fa22fddb7
Component: engine
2017-02-14 09:54:27 +08:00
6867302948
Merge pull request #30340 from ijrandom/master
...
Fix #30311 : dockerd leaks ExecIds on failed exec -i
Upstream-commit: eac68dbbbc7a58c20beb8d7cdcf80ade2ccebb34
Component: engine
2017-02-14 10:13:16 +09:00
e18ea312b4
Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
...
This fix updates docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
from 545102ea07aa9796f189d82f606b7c27d7aa3ed3
Changes related to docker issue:
1. Validate insecure registry (`--insecure-registry`) values (30746)
This fix is related to 30746.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 20141b521923f69f8152d3c2ef4535c3cf3ef014
Component: engine
2017-02-13 16:37:47 -08:00
d65a5e678c
Update plugin_volume apidocs for v2
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 48ccdf1f7aa28c14117076f940f66ce753283117
Component: engine
2017-02-13 16:28:54 -08:00
086225727c
Merge pull request #30983 from tianon/usr-bin-env-bash
...
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
Upstream-commit: 4163b5cbd59e2a5dee411310cb49734472f95440
Component: engine
2017-02-13 20:48:05 +01:00
Akihiro Suda
Victor Vieux
Brian Goff
Tonis Tiigi
Alexander Morozov
Darren Stahl
John Howard
Alihan Demir
Anusha Ragunathan
Steven Hartland
allencloud
Justin Cormack
bingshen.wbs
Vincent Demeester
Antonio Murdaca
Steve Durrheimer
Arash Deshmeh
Zhang Wei
Misty Stanley-Jones
Sebastiaan van Stijn
Drew Erny
Yong Tang
Gabriel Linder
Alessandro Boch
yupengzte