Commit Graph

27576 Commits

Author SHA1 Message Date
0218ffcf08 Merge pull request #26921 from tophj-ibm/bump-remaining-go-versions-to-1.7.1
Bump remaining Dockerfile go versions to 1.7.1
Upstream-commit: 789e6868904d724ed56fe4b141b4b557f477f1ca
Component: engine
2016-09-27 11:51:56 +01:00
67175b8b48 Merge pull request #24634 from thaJeztah/make-network-name-required
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00
1cd6ebde3c Merge pull request #26219 from dmcgowan/optimize-token-server-error-test
Update token server error test to not fail on retries
Upstream-commit: 33466024e73e95e175619170be5d9e36e800b961
Component: engine
2016-09-26 23:17:09 +01:00
c712a740c1 Merge pull request #26891 from allencloud/fix-26890-duplicate-overlay-drivers-in-info
fix #26890 avoid duplicate overlay drivers in info
Upstream-commit: 8dc63675c547d0f29f03b1e0e042b8045245d02f
Component: engine
2016-09-26 14:42:39 -07:00
80748a530c Merge pull request #26927 from thaJeztah/update-layerstore-for-solaris
Add setupInitLayer() placeholder for Solaris
Upstream-commit: 5a8cee5ab6ba640939b1fec27596ebb1eb572988
Component: engine
2016-09-26 14:36:58 -07:00
21745716c7 Merge pull request #26923 from tophj-ibm/ppc64le-change-go-download-link
ppc64le: update dockerfile golang dl link
Upstream-commit: cab5da77d15c8c5a8bac41a9c13edb83fd1dffd6
Component: engine
2016-09-26 14:35:57 -07:00
f6a08edcd6 Merge pull request #26885 from allencloud/add-swarm-types-comments-and-fix-nits
add swarm type comments and fix nits
Upstream-commit: 373d3200c257fe80ec4da1f260dc69297b31e87c
Component: engine
2016-09-26 22:33:24 +01:00
07ae88a2de Merge pull request #26925 from anusha-ragunathan/pluginstore-handle
Add Handle method to plugingetter.
Upstream-commit: 1de5043f4e7f4283909eac0f2268e701395d7ad9
Component: engine
2016-09-26 13:52:36 -07:00
9a2a361f03 Merge pull request #26536 from anusha-ragunathan/aufs_unmount
Add retry logic during aufs unmount.
Upstream-commit: c35ab68665d0fbaa759150e8f13703a2f79b2e75
Component: engine
2016-09-26 13:17:12 -07:00
ac6210fa0d Merge pull request #26924 from thaJeztah/update-authors
Update AUTHORS
Upstream-commit: 9ea591f6ff8aaeb6e8b22ca7372081e7d7001fa1
Component: engine
2016-09-26 22:09:18 +02:00
a3e576de79 Merge pull request #26744 from LK4D4/attach_before_start
libcontainerd: attach streams before create
Upstream-commit: f67096c20b0bcbee115c9923861bfc25bbe3b4f2
Component: engine
2016-09-26 13:08:05 -07:00
b667e379f0 Add setupInitLayer() placeholder for Solaris
Commit d2bc5d62761c24866e4b0ff4099dd54264bd9325 added
a setupInitLayer() for all platforms, but did not
add a placeholder for Solaris.

This adds the missing placeholder.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb2fbaa3f2c59bf4a78a3f642fe99a74e3e33b3e
Component: engine
2016-09-26 22:05:28 +02:00
6352e3e776 API return network-list if no network-name or id is provided
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.

This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).

Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
2016-09-26 21:44:34 +02:00
8cdfc4f743 Merge pull request #26902 from yuexiao-wang/add-index
Add menu for How PKI works
Upstream-commit: afd22d27c3674d24458dbc530edd609e41b0f7ab
Component: engine
2016-09-26 21:20:30 +02:00
f2233e9c75 Merge pull request #23886 from AkihiroSuda/stackcli
add `docker stack ls`
Upstream-commit: a4dd51a6601f7cb07b23a55134dc18a12d2814ee
Component: engine
2016-09-26 21:19:04 +02:00
2968e0ea8a Merge pull request #26918 from thaJeztah/update-man-page-for-devmapper-options
Update man page for dm.xfs_nospace_max_retries
Upstream-commit: 83873205bbdad873071f960586b62f997cb23e54
Component: engine
2016-09-26 21:11:14 +02:00
e3f16cbbf2 Merge pull request #26922 from jstarks/add_debugging_to_foreign_layer_pull
Windows: Add debug output to foreign layer pull
Upstream-commit: 848bffa7862bdc494c3dbd34bca87409306cf6cf
Component: engine
2016-09-26 14:45:47 -04:00
fe313a4545 Add Handle method to plugingetter.
This is necessary for IPAM and network plugins.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: b3bd7f80afea51d42d3bd2d194d36a6852a7d51f
Component: engine
2016-09-26 11:06:26 -07:00
356aff7cd8 Merge pull request #26839 from tonistiigi/build-cache
Implement build cache based on history array
Upstream-commit: 7944480dd0dfb00323f960d37c31d0ddad5f6cf2
Component: engine
2016-09-26 17:31:49 +00:00
9ef9889246 Merge pull request #26916 from aaronlehmann/sanity-check-replicatedreplicas
cli: Add more nil checking to service pretty-printer
Upstream-commit: 64af86e74d4ed4a8f5adce88212e9c69020ae986
Component: engine
2016-09-26 13:06:07 -04:00
32c9e42dd1 fix #26890 avoid duplicate overlay drivers in info
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ea266f8f7ad74f671cc7595c17ea122a5593bec4
Component: engine
2016-09-27 00:19:04 +08:00
8a1347213b Bump remaining Dockerfile go versions to 1.7.1
These weren't updated with the switch to go1.7.1

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: f431211631f0dd68ec41c970e5b951c5141e3f9b
Component: engine
2016-09-26 12:13:39 -04:00
d0d3f107a2 Update AUTHORS
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 022bce54f547737cb73a507c977fdde8c44a43e2
Component: engine
2016-09-26 18:13:14 +02:00
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
f5baeabbcf Windows: Add debug output to foreign layer pull
Write the foreign layer URLs being downloaded into the debug log.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 6b7d028085e0e6ac0c5f224f0a493839e2beeba3
Component: engine
2016-09-26 08:56:34 -07: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
967a630f11 Update man page for dm.xfs_nospace_max_retries
This option was added through commit
0d03c060c7e6800e60833c4462b917ee9b081440,
but didn't update the man page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 41c6083c34969cf97b21e3cf2eed65d0fca91879
Component: engine
2016-09-26 15:08:23 +02: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
d4b8261601 add swarm type comments and fix nits
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c1925ce34606d45f9d3b1433867a697414124d14
Component: engine
2016-09-26 17:17:52 +08:00
5bf8eb9536 cli: Add more nil checking to service pretty-printer
Currently, if the service mode is not "global", this code assumes that
Replicated is non-nil. This assumption may not be true in the future.
Instead of making the assumption, explicitly check that Replicated is
non-nil before using it.

Similarly, for limits and reservations, enclose methods that read from
Limits and Reservations within checks that those fields are non-nil.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 02cc464e1ab0a8fcebfd10db95bcde654d901391
Component: engine
2016-09-26 10:12:24 +01: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
92623de9dd Add menu for How PKI works
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: c228931384c7a0eb143cba3a4a4804daa6f79eee
Component: engine
2016-09-26 14:17:47 +08: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