618fd96ae8
ppc64le: update dockerfile golang dl link
...
updates golang download link to be consistent with other dockerfiles
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 6a014a0d33e1618642403b47ead8017626d07fe2
Component: engine
2016-09-26 12:03:38 -04:00
649581b0c1
Merge pull request #26909 from sdurrheimer/zsh-completion-stats-format
...
Add zsh completion for 'docker stats --format'
Upstream-commit: 285a9d5e351e01df255ce9345bf83fa4180ecd14
Component: engine
2016-09-26 10:32:52 -04:00
845977e0ef
Merge pull request #26910 from sdurrheimer/zsh-completion-multinodes-ps
...
Add zsh completion for multi-nodes 'node ps'
Upstream-commit: 6ac74720e0353957a3d83dfb76e85f737e204b79
Component: engine
2016-09-26 10:26:38 -04:00
2e2fa7e352
Merge pull request #26907 from yuexiao-wang/fix-typo
...
Fix typo for how pki works
Upstream-commit: 2a8b556ea50d080878dc42a25c9b1a4356d840a5
Component: engine
2016-09-26 11:58:19 +02:00
b454f93682
Merge pull request #26667 from allencloud/display-no-id-when-service-creation-fails
...
display service name in log when service creating fails
Upstream-commit: c009b7935eb270d2ec77d7a768902e5e1a7d84da
Component: engine
2016-09-26 10:56:35 +01:00
959565e943
Merge pull request #26908 from yuexiao-wang/fix-link
...
Fix the broken link
Upstream-commit: 7a6b99aef6c135899d4a74915caaa66e378bfce2
Component: engine
2016-09-26 11:54:36 +02:00
1b0bbf5fcf
Merge pull request #26892 from ripcurld00d/stats_format_docs
...
Add documentation for docker stats --format
Upstream-commit: c8a19aee09756867d68ae8c70c2134a0193866ac
Component: engine
2016-09-26 10:52:01 +02:00
63b96bda90
Merge pull request #26858 from cpuguy83/better_error_on_mount_fail
...
Fix some places where low-level errors bubbled up
Upstream-commit: 37fdba0428c676786d099feec1ca142fb06ba985
Component: engine
2016-09-26 01:44:56 -07:00
d8e01f6cf0
display no id in log when service creating fails
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6ae8c83ebe253104e9471aaa6e80c5acf24b1d9e
Component: engine
2016-09-26 16:23:28 +08:00
1ac60a1881
Add zsh completion for multi-nodes 'node ps'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d918fc8e08e4e8684c7074c310d491cd15412865
Component: engine
2016-09-26 09:16:16 +02:00
8612f6b746
Add zsh completion for 'docker stats --format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 7aa600dffbd3d5c615f74e93a1d9782c442c292d
Component: engine
2016-09-26 09:10:29 +02:00
dee86cf062
Fix the broken link
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cfb07e642d23622412c5455ca70c42140268f9fe
Component: engine
2016-09-26 15:03:56 +08:00
d3c94f4001
Fix typo for how pki works
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bf9c6d3115dd388cf379ec1a80d29104521a7b42
Component: engine
2016-09-26 14:28:31 +08:00
f2acf43e07
Add documentation for docker stats --format
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 9c7b3040cc97dae0a4fc20f999ca51adce353944
Component: engine
2016-09-26 09:26:48 +03:00
30a378398b
Merge pull request #26881 from miaoyq/del-redundant-func
...
The function "errClusterNetworkOnRun" is't used in the project
Upstream-commit: 8eadd439c66d1805147d4f4be8cf4786575176c3
Component: engine
2016-09-25 19:51:16 +02:00
8dc6246a72
Merge pull request #26585 from yongtang/24538-better-error-remove-internal-networks
...
Improve error message for removing pre-defined (e.g., `ingress`) network
Upstream-commit: 4ae7d8ef4df82ea482541223fa0bc6ad2d641db2
Component: engine
2016-09-25 16:54:32 +02:00
7ccf7f0db3
Merge pull request #24290 from ownaginatious/armv6_arch
...
Changed ArchLinux image maker script to support ARMV versions other than 7
Upstream-commit: 219f88364c7e06f3a122089d5997800b9e2fd04d
Component: engine
2016-09-25 01:43:20 +02:00
c7b9575ce1
Revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
...
This commit revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
to improve error message for removing pre-defined (e.g., `ingress`) network.
This commit is related to 24538.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f4e94617f087fc19614858fe496314673ad3877d
Component: engine
2016-09-24 12:14:04 -07:00
832ffce833
Improve error message for removing pre-defined (e.g., ingress) network
...
This fix tries to address the issue raised in 24538
where the error message is unclear when removing pre-defined networks:
```
docker network rm ingress
Error response from daemon: rpc error: code = 7 desc = 4vlxuzpk8bxdsxpyvkxluol5g is a pre-defined network and cannot be removed
```
This fix improve the error message so that if network's name is specified
in the `RemoveNetwork`, then error message will contain the name and the ID
(instead of just an ID):
```
docker network rm ingress
Error response from daemon: rpc error: code = 7 desc = ingress (4vlxuzpk8bxdsxpyvkxluol5g) is a pre-defined network and cannot be removed
```
An integration test has been added to cover the changes.
This fix fixes 24538.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: de4871165b43ec813940858a1c96ab6bb1fbd776
Component: engine
2016-09-24 11:59:26 -07:00
df837b351f
Merge pull request #26869 from anusha-ragunathan/test-fix
...
Return pipeline errors correctly.
Upstream-commit: baa0324e31885e389663806c9a653e54e42fd3fe
Component: engine
2016-09-24 08:37:21 -04:00
3eaab012dd
Fix some places where low-level errors bubbled up
...
Found a couple of places where pretty low level errors were never being
wrapped with any sort of context.
For example, if you try to create a local volume using some bad mount
options, the kernel will return `invalid argument` when we try to mount
it at container start.
What would happen is a user would `docker run` with this volume and get
an error like `Error response from daemon: invalid argument`.
This uses github.com/pkg/errors to provide some context to the error
message without masking the original error.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2a5e85e2e871bf037c976471cf8a14da22ddd9a9
Component: engine
2016-09-24 08:01:21 -04:00
5ff26bdf94
Merge pull request #25853 from jhorwit2/jah/event-refactor
...
Refactor to new engine-api events api
Upstream-commit: 8c929eeb34673752d1bbaf7e9e52731bf6171b37
Component: engine
2016-09-24 11:07:12 +02:00
a7d35ae120
Merge pull request #26878 from mrjana/net
...
Vendoring libnetwork @bf3d9ccfb8e
Upstream-commit: 0a24ae812509fe9171426ec636638a8d83340142
Component: engine
2016-09-24 09:41:22 +01:00
dc54335e17
Delete the redundant function 'errClusterNetworkOnRun'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 9c3d1236d22504410bf7363acbad382917e3a630
Component: engine
2016-09-24 11:24:48 +08:00
9b9def0b18
Vendoring libnetwork @bf3d9ccfb8e
...
Fixes certain node management issues when a daemon is restarted or fails
or leaves and joins a swarm.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: cd20621201d48f76b856d7d2404ee182e41e3492
Component: engine
2016-09-23 16:06:38 -07:00
711fedae4a
Return pipeline errors correctly.
...
To use a deferred func to overwrite the returned error requires using
the 'named' error. So reuse err, instead of pipelineError. Also, the old
pipelineError will never be nil, since its executed before the error can
be set.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: af2e2562494a11ee8e6ede58a29cc250935e74c4
Component: engine
2016-09-23 13:09:56 -07:00
da06cf8da0
Merge pull request #26843 from anusha-ragunathan/vol-unmount-win
...
Call "VolumeDriver.Unmount" during container stop.
Upstream-commit: b8265e55508db99aea632033b2f5008f921b11e2
Component: engine
2016-09-23 10:37:28 -07:00
a1a96e1887
Merge pull request #26534 from allencloud/better-checkpoint
...
change code and fix docs about checkpoint
Upstream-commit: 047400c64c9a19fe9c20176dc9ca5d86301a91ae
Component: engine
2016-09-23 12:34:55 -04:00
d76a37578e
Merge pull request #26844 from mrjana/net
...
Vendoring libnetwork @6caf9022fa09
Upstream-commit: 2c41c020d19e76030a4c6447fafe79eb8171ab14
Component: engine
2016-09-23 12:03:02 -04:00
7366022982
Merge pull request #26842 from jstarks/fix_save
...
Windows: Back up files mutated during layer import
Upstream-commit: 5039d9aa6ccf6e6cbcefe7b61c4f1e0af0171bd2
Component: engine
2016-09-23 08:37:24 -07:00
3979b0fbf1
Merge pull request #26835 from cpuguy83/fix_make_bundles_dir
...
Fix issue with bundles dir volume
Upstream-commit: 2d9173f04baea783cdfaa003ae4e4876fb55c4f2
Component: engine
2016-09-23 15:46:24 +02:00
1c6164038a
Merge pull request #26834 from thaJeztah/deprecate-docker-daemon
...
Deprecate "daemon" subcommand
Upstream-commit: 57f0164fd2aff893364d4544f8778b0925ac287a
Component: engine
2016-09-23 08:51:18 -04:00
945ce288c6
Merge pull request #26412 from YuPengZTE/devERR
...
In error, the first letter is low-case letter
Upstream-commit: bc22318e12451a495cd30be8f6a736be64e9bd3a
Component: engine
2016-09-23 14:32:27 +02:00
f557e61a5e
change-code-and-fix-docs-about-checkpoint
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9b4ba34d046fc9fd65fc060af016d2b2b9b95957
Component: engine
2016-09-23 19:37:43 +08:00
a0b2adc110
Merge pull request #26516 from yongtang/26453-build-bad-syntax
...
Check bad syntax on dockerfile before building.
Upstream-commit: 72f556a9ff1043a4188e8eeef892d8a0ba4fe34f
Component: engine
2016-09-23 12:24:20 +02:00
77630b1fc2
In error, the first letter is low-case letter
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 4dbc78a5afdeaccbfe2be673d324550de4179903
Component: engine
2016-09-23 17:30:13 +08:00
71ee663490
Merge pull request #26854 from lixiaobing10051267/masterNetworkID
...
the network id is not consistant with the real id created
Upstream-commit: b0671fdc0b0a909966e0d11a50492cb71f114b50
Component: engine
2016-09-23 11:29:02 +02:00
a045d7b33b
the network id is not consistant with the real id created
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 392aae44fd8ea5755305104e1c2a1c85f39d4a07
Component: engine
2016-09-23 17:40:55 +08:00
f04a024adb
Merge pull request #26803 from YuPengZTE/devFirstLetter
...
Capitalizes the first letter in notes of dockerfile
Upstream-commit: a94067c07fbfa77cdc57aa33c2fe2270cabb9ca3
Component: engine
2016-09-23 04:27:52 -05:00
29a3433f96
Merge pull request #26805 from miaoyq/refactor-allocateNetwork
...
Replace two array with a map type, make it easier to understand.
Upstream-commit: 8643903e49c2d25272e59fe09a75803aa05ed841
Component: engine
2016-09-23 10:15:37 +02:00
89f68050aa
Merge pull request #26850 from YuPengZTE/devDot
...
Del the extra dot
Upstream-commit: a70e6dfe80c8b224b1df4510a3729c9a2c1d249e
Component: engine
2016-09-23 10:10:11 +02:00
69f06771c4
Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
...
support docker node ps multiNodes
Upstream-commit: c03c80b1b03f3a061072af07d6d1fb811f29a9e3
Component: engine
2016-09-23 09:50:24 +02:00
d9ba2cf275
Del the extra dot
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 73770c00fc322929215108a44049e51f1d89cae5
Component: engine
2016-09-23 15:22:52 +08:00
1534d985c8
Merge pull request #26813 from Starefossen/patch-2
...
docs: add missing 'on' in Oracle installation guide
Upstream-commit: 7a789c52059e2ebb9f03a9ba7f7af47ff315a23e
Component: engine
2016-09-23 09:14:59 +02:00
3abdd760e4
Merge pull request #26836 from thaJeztah/update-exec-api-docs
...
Add missing API docs for "privileged" and "user" exec
Upstream-commit: 9803d4736f79f2b78434699f6d162a8bbacd447f
Component: engine
2016-09-23 08:59:18 +02:00
c42acbfe8e
Add GetListenAddress in ClusterProvider
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: fbcdca7ebcd45d74c40fbccbb07f2d3decfb8628
Component: engine
2016-09-22 21:00:32 -07:00
1778a3ba1e
Vendoring libnetwork @6caf9022fa09
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 746113d5840d064843a3d0b4c2cd68459b1d9415
Component: engine
2016-09-22 21:00:32 -07:00
0afb3aa46c
Merge pull request #25987 from msabansal/dnssupport
...
Support for Windows service discovery
Upstream-commit: d3139fc84af390142341a29d3512462d1a449045
Component: engine
2016-09-22 20:56:03 -07:00
792dff1fb0
Replace two array with a map type, make it easier to understand.
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 1989b1b58cc8c416e430a1fd824626b259dab5f6
Component: engine
2016-09-23 09:52:05 +08:00
4954dc9e06
Call "VolumeDriver.Unmount" during container stop.
...
"VolumeDriver.Mount" is being called on container start.
Make the symmetric call on container stop.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d576509d8ad1ef4770cb3959a792748c8658b0be
Component: engine
2016-09-22 18:20:39 -07:00
