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
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
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
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
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
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
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
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
55259ac6bb
Merge pull request #30834 from allencloud/refactor-daemon-cluster-handler-and-helper
...
refactor cluster/helper.go and split cluster.go into multiple files
Upstream-commit: b8a3595941bd9037e2470519aab142262a0e7c49
Component: engine
2017-02-13 11:31:30 -08:00
b39f983793
Merge pull request #30823 from albers/completion-plugin-upgrade
...
Add bash completion for `docker plugin upgrade`
Upstream-commit: c9fa3eed1b38cc3056107ab2d1572f829a513062
Component: engine
2017-02-13 11:09:21 -08:00
ec2663feb9
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
...
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 52379fa76dee07ca038624d639d9e14f4fb719ff
Component: engine
2017-02-13 11:01:54 -08:00
3bb0888796
Merge pull request #30980 from albers/completion-mode-non-blocking
...
Fix bash completion for `--log-opt mode`
Upstream-commit: ca3f82752cbead992989478c2536ef94d1ff87e4
Component: engine
2017-02-13 11:00:27 -08:00
4ace6bef34
Merge pull request #29864 from tianon/schemaVersion-2
...
Update "download-frozen-image-v2.sh" for schemaVersion 2
Upstream-commit: 5870675ebc0db9fbe07736a59a6226b805ba00dc
Component: engine
2017-02-13 19:53:19 +01:00
8d76b7f3ac
Merge pull request #30970 from cmehay/install
...
Force copy on make install to avoid Text file busy error
Upstream-commit: 6fb658eaed567666579669987e2fc4bdfd9e6494
Component: engine
2017-02-13 13:49:46 -05:00
ee4c3e683f
Add bash completion for docker plugin upgrade
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2c52ec8403d721e567a7c3c129fc38c650b85ba4
Component: engine
2017-02-13 19:36:54 +01:00
9952e41458
Fix bash completion for --log-opt mode
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1fdb54eaf353f78f3657703c07e71f411f3720b7
Component: engine
2017-02-13 18:49:37 +01:00
6affde1e32
Merge pull request #29673 from vdemeester/extract-daemon-config
...
Extract daemon configuration and discovery to their own package
Upstream-commit: f3a8886d8890d6797a568ab316baf9400ee2e1e1
Component: engine
2017-02-13 09:11:13 -08:00
5e49c7739c
Merge pull request #30851 from chchliang/networktest
...
add testcase check connect.EndpointConfig not nil
Upstream-commit: 019eb5d71f7ebe89c5900df6e3219354dd3ceb01
Component: engine
2017-02-13 10:58:02 -05:00
bda128282d
Merge pull request #30948 from sdurrheimer/zsh-completion-service-format
...
Add zsh completion for 'docker {service ls,stack services} --format'
Upstream-commit: 9ec42d4c3cfe5e5289fc321709a823ecfc8e7144
Component: engine
2017-02-13 09:57:15 -05:00
1cd5a69df3
Merge pull request #30949 from sdurrheimer/zsh-completion-ps-ports-filter
...
Add zsh completion for 'docker {ps,service ls} --filter expose|publish'
Upstream-commit: ae190da1d2f2758f2162ac69cd23806a6d48a37a
Component: engine
2017-02-13 09:44:46 -05:00
76a1182bf2
Merge pull request #30947 from sdurrheimer/zsh-completion-daemon-default-shm-size
...
Add zsh completion for 'dockerd --default-shm-size'
Upstream-commit: 6ab2220043f173a8ac01cc0492ea40022cc6053a
Component: engine
2017-02-13 09:34:42 -05:00
df3858634b
Merge pull request #30944 from sdurrheimer/zsh-completion-build-squash
...
Add zsh completion for 'docker build --squash'
Upstream-commit: 0d9bb4ee125d5051a1db9d8afa0dc03d81d840a9
Component: engine
2017-02-13 09:33:39 -05:00
f31ca9220e
Force copy on make install to avoid Text file busy error
...
Signed-off-by: Christophe Mehay <cmehay@online.net >
Upstream-commit: 01273ad85f334ff0ae141cfa8ab0e52ca895fd3d
Component: engine
2017-02-13 14:17:06 +01:00
d60e30c4e4
Merge pull request #30871 from allencloud/split-swarm-test-into-multiple-files
...
split docker_api_swarm_test.go into multiple files
Upstream-commit: a11e3bd5f943bbefecec3613a6e919b827adf05d
Component: engine
2017-02-13 11:42:25 +01:00
0b67975de7
Merge pull request #30965 from YuPengZTE/devDes
...
fix typo
Upstream-commit: a8f4d82176139babcd818fcb4590eec22860ffc9
Component: engine
2017-02-13 00:02:28 -08:00
4d0e710fd3
fix typo
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: 266107f301b8d470f6ff67da41960fccf9e1a4ba
Component: engine
2017-02-13 15:47:38 +08:00
83500fc7d6
Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal
...
Add missing link in deprecated.md
Upstream-commit: b5b6752230b77902536bab28403426c30d6f6ce0
Component: engine
2017-02-12 23:37:37 -08:00
af3282f0f9
Merge pull request #30940 from sdurrheimer/zsh-completion-swarm-unlock-cmds
...
Add zsh completion for 'docker swarm unlock|unlock-key' commands
Upstream-commit: 27ab0086263986033bde45d0c48423408cd653ea
Component: engine
2017-02-12 23:35:46 -08:00
877717c8a7
remove redundant colon introduced by mistake
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: df64bc3ed0e315a1064937d1a3ad6d0f324b11c8
Component: engine
2017-02-13 10:16:57 +08:00
b0073b9ee0
Add missing link in deprecated.md
...
This fix adds a missing link in deprecated.md
```
Deprecated In Release: [v1.13.0]...
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ee65dd0286b2e3d5d5b3a61c24972b962363c0de
Component: engine
2017-02-12 15:15:52 -08:00
feca9bd63f
Add attachable for network object in swagger api docs
...
This fix adds `Attachable` property for network object
in the documentation of Swagger API docs
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ca020416e40ac0aa710aff34e278b2c981812ab2
Component: engine
2017-02-12 14:07:55 -08:00
