966bd9ff19
Use the correct version of glide
...
In `man/Dockerfile` we are specifying a tagged version of glide to
checkout, but never actually checking it out.
This checks out the requested version before building.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ce312a910c275da854880e1746332cae7d82e9df
Component: engine
2016-08-18 20:43:50 -04:00
cd9d633b0a
Merge pull request #25843 from darrenstahlmsft/RevendorHcsshim
...
Vendor hcsshim to v0.4.2
Upstream-commit: 09e1de2080fd3b0bafb38adbd4b8c12ee949794d
Component: engine
2016-08-18 17:21:02 -04:00
df9fd6f3a4
Merge pull request #25841 from anusha-ragunathan/vendor-dist
...
Vendor distribution changes.
Upstream-commit: 5b6063c83701d962325e16bec15a0cecb154e15d
Component: engine
2016-08-18 17:20:03 -04:00
db8cc1fdde
Merge pull request #24978 from yongtang/24912-build-with-progress
...
Add hint of progress to the output of `docker build`
Upstream-commit: 282b0aff08030a2521adf7d64bdd333f0864b720
Component: engine
2016-08-18 16:10:48 -04:00
9ab2ca7546
Merge pull request #25708 from timfeirg/master
...
expose RemovalInProgress in StateString #25652
Upstream-commit: 426046db3a5c3c056f02bf3ad5efd1342ff79533
Component: engine
2016-08-18 21:54:48 +02:00
c7c2901b56
Vendor hcsshim to v0.4.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ba54581c3d4e388586100c53ee705eaac3c2201c
Component: engine
2016-08-18 12:53:01 -07:00
ab2c762e05
Merge pull request #25844 from tiborvass/1.12.1-changelog-to-master
...
Merge 1.12.1 CHANGELOG to master
Upstream-commit: 139bf2c98e13db23d9939b4af4dc739c2fa40008
Component: engine
2016-08-18 21:14:07 +02:00
98b77062ae
Merge 1.12.1 CHANGELOG to master
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 3b05e95d98daf1d8d278d7b343add205a0b8382e
Component: engine
2016-08-18 11:35:44 -07:00
f1f995a052
Merge pull request #25839 from cpuguy83/add_comments
...
Add requested comments about old buggy behavior
Upstream-commit: 923053d1edac552a8d48cbb293c4ec935a93348b
Component: engine
2016-08-18 10:31:37 -07:00
9ad4bec0bc
Merge pull request #25743 from lixiaobing10051267/masterInspect
...
Check the return message of docker service inspect
Upstream-commit: 6fa69d2d0610320cce61517eca6e4471f5381561
Component: engine
2016-08-18 19:25:08 +02:00
389d0f753e
Vendor distribution changes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 764d97444eb1ff41207a99b291346819ad1f51cd
Component: engine
2016-08-18 09:30:31 -07:00
9c61498be3
Merge pull request #25726 from vieux/new_plugin_system_doc
...
adding some documentation about the new plugin system
Upstream-commit: 88a6a7763b789a35fff9df4e52e48ca99afd3c08
Component: engine
2016-08-18 17:20:09 +02:00
c48cb27659
Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
...
Specify woker node for docker swarm leave command
Upstream-commit: 90308fd78315412c30da90217ee14515de4fbf8a
Component: engine
2016-08-18 17:08:41 +02:00
9ebd97c86d
Merge pull request #25812 from johananl/patch-1
...
Update device-mapper-driver.md
Upstream-commit: 840a1982803425d67d9c29acbed0d16ecaa6e4ed
Component: engine
2016-08-18 17:08:14 +02:00
2c45777add
Add requested comments about old buggy behavior
...
Address comment: 246d1eb58e (r75242138)cpuguy83@gmail.com >
Upstream-commit: c7075bd14949bae1ec938118ee96e4f1c9830b41
Component: engine
2016-08-18 10:07:22 -04:00
02f084e00a
Merge pull request #25815 from justincormack/capdoc
...
Split list of capabilities into those added by default and those not
Upstream-commit: d854c4fcc6255330693eee67b655606e92b11544
Component: engine
2016-08-18 15:26:59 +02:00
46a42da7e0
Merge pull request #25785 from WeiZhang555/fix-flaky-external-volume-driver
...
bugfix: report "destroy" after all volumes of container destroy
Upstream-commit: 3cebff8b869d2720b12618ef5bff22fa4f0fd4a6
Component: engine
2016-08-18 09:58:54 +02:00
c8732c07e1
expose RemovalInProgress in StateString #25652
...
Signed-off-by: timfeirg <kkcocogogo@gmail.com >
Upstream-commit: 37466cc8c85ccbdade57463ae2aacac638002f8a
Component: engine
2016-08-18 11:25:27 +08:00
742fa26537
Merge pull request #25825 from cpuguy83/25821_fix_nil_opts
...
Fix volume not working after daemon restart
Upstream-commit: 1b954973cce64e42b440ff63fa998593f3e499e9
Component: engine
2016-08-17 20:15:34 -07:00
c10fbfa1e3
Merge pull request #25822 from Microsoft/jjh/typo
...
Fix minor comment typo.
Upstream-commit: 79210b9d5a466494911ba4339011c4716b956fe6
Component: engine
2016-08-17 22:07:36 -04:00
a87ab137b8
Specify woker node for docker swarm leave command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fd660e21bf6568c3f98424bdff3b9672cd2a3ef8
Component: engine
2016-08-18 09:35:11 +08:00
69cd6761bb
Fix volume not working after daemon restart
...
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.
In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.
Ensures 2 things:
1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.
2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 246d1eb58e807f2cf2d2b387e267dcfa228f96a8
Component: engine
2016-08-17 20:36:17 -04:00
f5ce997d75
Fix minor typo
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d56c2ea9edf0a6f5abfb5be8d241ecf8375054ff
Component: engine
2016-08-17 16:10:01 -07:00
92992ea84a
Merge pull request #25801 from thaJeztah/improve-volume-validation-message
...
improve error message for volume names that are too short
Upstream-commit: b0b3249bc2265dcb7a290501dcc93c65f9265848
Component: engine
2016-08-17 23:33:08 +01:00
02f0dc9ea5
Merge pull request #25808 from justincormack/parallel-tests
...
Run seccomp tests in series not parallel
Upstream-commit: a1fece68211826386612ba16526543ba052a46dd
Component: engine
2016-08-17 14:50:24 -07:00
3a9b1e9ecd
Split list of capabilities into those added by default and those not
...
The documentation was a bit unhelpful as to what are the default
capabilities, so split.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: bf7a3f010443ecd614baf0450c3193b1f5e52bc2
Component: engine
2016-08-17 21:16:54 +01:00
f3a1d45b88
Merge pull request #25809 from justincormack/patricia
...
Update go-patricia to 2.2.6
Upstream-commit: d8e12f87559ae21327820b3cd5abb0249ab47519
Component: engine
2016-08-17 15:25:17 -04:00
3497960ec5
Update device-mapper-driver.md
...
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com >
Upstream-commit: 086542a687235b0c3c8a6985755b918e2e93fcbc
Component: engine
2016-08-17 21:58:30 +03:00
9d361e17cf
Merge pull request #25805 from crosbymichael/oci-import-paths
...
Replace old oci specs import with runtime-specs
Upstream-commit: 2d93186e001086db7629c9fddfd76d0add7925cd
Component: engine
2016-08-17 11:07:13 -07:00
891863d8ab
Update go-patricia to 2.2.6
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: d16f96262e25487f84d6217bf4c224280a84d89f
Component: engine
2016-08-17 19:02:32 +01:00
f6d6194ce9
Run seccomp tests in series not parallel
...
Fix #24803 as this had been failing sometimes.
As the parallel tests are probably genuine failures, and
had already been cut down, I will re-create these specifically
as a parallel execution test with no seccomp to make the
cause clearer.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 84ec04306caac458c237881b1869fb2b077fced4
Component: engine
2016-08-17 18:48:06 +01:00
6c683fac48
Replace old oci specs import with runtime-specs
...
Fixes #25804
The upstream repo changed the import paths.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
3da3f4e31d
Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format
...
Add zsh completion for 'docker {network,volume} ls --format'
Upstream-commit: 2ae49a088718f675ec11c387072fe6de8b22f0c7
Component: engine
2016-08-17 16:51:51 +02:00
d229e2f53e
Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context
...
Add missing docs about binary remote contexts
Upstream-commit: b4abe38d43f1158b3c085ef006e88740296a3020
Component: engine
2016-08-17 16:43:35 +02:00
1a062ddf1e
improve error message for volume names that are too short
...
this improves the error message if a user tries to
create a volume with a single-character name:
Before this change:
docker volume create --name a
Error response from daemon: create a: "a" includes invalid characters for a local volume name, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed
After this change:
docker volume create --name a
Error response from daemon: create a: volume name is too short, names should be at least two alphanumeric characters
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8d5a615045f691536baf8a4cb69e0c505bc1cad2
Component: engine
2016-08-17 16:40:24 +02:00
703353742f
Add missing docs about binary remote contexts
...
This feature was added in docker 1.8, through
7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7.
However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.
Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268de3c674b04d48895b7e46ae890ef795
This moves the API docs to the correct
versions, and restores the CLI documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a5ba032c7421ef7a429e780d12d0f604a045258a
Component: engine
2016-08-17 16:15:59 +02:00
a410528fcc
Merge pull request #25771 from mrunalp/allow_host_ns_with_user
...
Allow using --pid=host and --net=host when --userns=host
Upstream-commit: 3473980a295067c8a265feff83be2ee306afaceb
Component: engine
2016-08-17 09:57:30 -04:00
61a857e388
Merge pull request #25788 from sdurrheimer/zsh-completion-volumes-ls-filter-label
...
Add zsh completion for 'docker volume ls --filter label'
Upstream-commit: 2c224e4fc09518d33780d818cf74026f6aa32744
Component: engine
2016-08-17 11:11:27 +02:00
6964d60fa7
Merge pull request #25634 from darrenstahlmsft/RevendorHcsshim
...
Revendor hcsshim to v0.4.1
Upstream-commit: 5e2a5199570169934fb80819356e5afb8bc6e8c1
Component: engine
2016-08-17 10:50:00 +02:00
e997af8b70
Merge pull request #25704 from thaJeztah/cleanup-api-markdown
...
Cleanup API docs Markdown formatting and wording
Upstream-commit: 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51
Component: engine
2016-08-17 10:39:45 +02:00
2943f3420d
Merge pull request #25751 from yuexiao-wang/clean-docs
...
Remove mess words in installation doc
Upstream-commit: bbd5396955a8c36b9f208d64fe580b769c1686f5
Component: engine
2016-08-17 09:59:36 +02:00
d8621fcdfc
Merge pull request #25783 from tonistiigi/fix-retry
...
Fix retry logic for out of sequence errors
Upstream-commit: 10a3a269a0c61bd63d6c694975bbe37aaf66672b
Component: engine
2016-08-17 09:56:06 +02:00
f9c2dcf3d2
Merge pull request #25778 from KostyaSha/patch-5
...
Don't confuse with sub-node
Upstream-commit: 32aad511f82cd2a082fb344d580cc3396a530e3f
Component: engine
2016-08-17 09:50:22 +02:00
f07d519e90
remove mess words in installation doc
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f8d5b880722bcc87113a08cbb2069b6311b89f39
Component: engine
2016-08-17 15:43:52 +08:00
e7fccf053b
Merge pull request #25368 from thaJeztah/remove-unused-size-parameter
...
Remove unused "size" query parameter for images
Upstream-commit: 27043ab718f891d115fcc4b785f215d70de81047
Component: engine
2016-08-17 09:28:51 +02:00
f0e6c337db
Add zsh completion for 'docker {network,volume} ls --format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 25009687be204db821c962e341ca91e7b8324c42
Component: engine
2016-08-17 08:21:15 +02:00
5a61089695
Add zsh completion for 'docker volume ls --filter label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d1870019a02e3d74e3ad173e3cb73dbe5574e831
Component: engine
2016-08-17 08:15:26 +02:00
80c9d996e6
fix broken link
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 79aa2b9f6da802ee1380c22c3afc8c0be7c493ce
Component: engine
2016-08-16 21:26:07 -07:00
bf5e17ead0
bugfix: report "destroy" after all volumes of container destroy
...
fixes #25766
If a container's AutoRemove is enabled, client will wait until it's
removed after container exits, this is implemented based on "destroy"
event.
Currently an "AutoRemove" container will report "destroy" event to
notify a hanging client to exit before all volumes are removed, this is
wrong, we should wait container until everything is cleaned up.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4df77c11e065bf96b04fc0328a7e7600a2e64937
Component: engine
2016-08-17 11:02:16 +08:00
449509c833
Fix retry logic for out of sequence errors
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 157561e95ccaef883fe106a38741acb3d493879f
Component: engine
2016-08-16 18:57:01 -07:00
