Commit Graph
25817 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 2a8da813b8 Merge pull request #24397 from dongluochen/nodelabels
support node label update
Upstream-commit: dc0d6040e48bcb715ee35fae23e85d50034b483e
Component: engine
2016-07-19 07:55:24 +02:00
Brian Goff 77d0030a64 Merge pull request #24755 from thaJeztah/fix-error-message
update "image delete" error to match actual behavior
Upstream-commit: f49fdb9d0b6345422a77c550b6d06ea7442f3f28
Component: engine
2016-07-18 22:47:55 -04:00
Tibor Vass a9e33b5e83 Merge pull request #24476 from stevvooe/services-log-driver-support
swarm: add log driver support for services
Upstream-commit: 1796680381e7cb35eda14243a3fba1ac911ff908
Component: engine
2016-07-18 19:08:12 -07:00
Dong Chen 5da3c90cb2 Support node label update.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1
Component: engine
2016-07-18 18:39:52 -07:00
Tibor Vass 7078c249a4 Merge pull request #23878 from jstarks/fix_windows_console
Windows: Always enable VT emulation
Upstream-commit: e6a97db2c932a2b80180c10f2896d7594108a406
Component: engine
2016-07-18 16:23:04 -07:00
Sebastiaan van Stijn 32c154633c Merge pull request #24692 from anusha-ragunathan/plugins-ux
Print plugin name on successful install, enable and disable.
Upstream-commit: 340964db1c8f161a2ad156023eb47dcc93bf804b
Component: engine
2016-07-19 01:09:35 +02:00
Sebastiaan van Stijn 3962d8ce71 Merge pull request #24754 from cpuguy83/24749_better_err_not_a_dir
Improve error message for ENOTDIR errors
Upstream-commit: bceacfa57f6386d908e91168cb4525ddc259ee63
Component: engine
2016-07-19 00:30:40 +02:00
Arnaud Porterie 6103a02b12 Merge pull request #24701 from dperny/test-leader-proxy
Added test for leader proxying
Upstream-commit: 6fc46474fbcba6a554526f8c27554a1793e13aab
Component: engine
2016-07-18 22:15:16 +00:00
Sebastiaan van Stijn 4be1849e85 update "image delete" error to match actual behavior
The error message;

    unable to delete .... (must be forced) - image is referenced in one or more repositories

Looks to be incorrect

Given the following images:

    docker images | grep 2d36b1c0ea40
    registry                           2                                     2d36b1c0ea40        7 weeks ago         171.2 MB
    registry                           2.4.1                                 2d36b1c0ea40        7 weeks ago         171.2 MB

Removing the image by *id* fails:

    docker rmi 2d36b1c0ea40
    Error response from daemon: conflict: unable to delete 2d36b1c0ea40 (must be forced) - image is referenced in one or more repositories

However, after untagging one image:

    docker rmi registry:2
    Untagged: registry:2

Removing the image works:

    docker rmi 2d36b1c0ea40
    Untagged: registry:2.4.1
    Deleted: sha256:2d36b1c0ea40159adc8b36f7563f1d7a6d443384fe2611e8b393c1cb3ae2e6ad
    Deleted: sha256:7abfddbf4e61927307b6646010845eeb7513ecc6541f33ea6103b2493e36aa4e
    Deleted: sha256:f512d7699dbb2994fe15d30ee1d404e57b58c3c310617b4471db649680b4cfa0
    Deleted: sha256:7291e34714908270aeda93f1dc681485f9734d41314e2fdc6c11f32ffa782a21
    Deleted: sha256:548f6562929484f3d78267e4b1e31dcfeb9f303059668888b4423ce5501c7fbc
    Deleted: sha256:afe56b46629e6d8e0bfc36fed13395a7cfa2bd83b58bb489976ef13553eff20b
    Deleted: sha256:cf0c3bd5d6a0a14ebf96cc7d3df79a37774a70f3086273e09da71a86fe74fec2
    Deleted: sha256:c5fdaf8b055f544d0211043e687905315c3a0b71c1c08df07e473dd0a30e43c8

    docker images | grep 2d36b1c0ea40
    <empty>

This changes the error message to reflect that behavior

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0988dd39598a46d911abc54c19fc3377698d630
Component: engine
2016-07-18 23:17:55 +02:00
Drew Erny ecd1805a72 Added test for leader proxying
Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: d305aa48ddcd17244ca408c59a40e2ef2392f414
Component: engine
2016-07-18 13:18:02 -07:00
Sebastiaan van Stijn 628a2430c9 Merge pull request #24764 from aaronlehmann/vendor-go-events
Update vendored go-events
Upstream-commit: e7b96102ff4df9209ca721e13f8f088d4da4c734
Component: engine
2016-07-18 22:09:31 +02:00
Sebastiaan van Stijn 0b31b4284a Merge pull request #24659 from justyntemme/master
Fix for issue #23884 (Documentation clarification)
Upstream-commit: 8ef820b53925a7600ee5485d8acf14cc3e35fc11
Component: engine
2016-07-18 21:58:55 +02:00
Justyn Temme a9b08686d4 suggested improvements for Debian install doc issue #23884
Signed-off-by: Justyn Temme <justyntemme@gmail.com>
Upstream-commit: b74b46b26a8a8fcacc1fdea080c0bebe70194e9f
Component: engine
2016-07-18 14:38:58 -05:00
Aaron Lehmann 6b6ea81208 Update vendored go-events
This is needed to suppress a log message about a harmless condition
which was previously logged at the WARNING log level with potentially
high frequency (https://github.com/docker/go-events/pull/11).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: db9bc51cbeb40204ff15ea1a40db8d3736ad3845
Component: engine
2016-07-18 10:38:27 -07:00
Anusha Ragunathan adb3025793 Print plugin name on successful install, enable and disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 6dca1e6d3f875de7a6652390f65fdb8ec2623e3b
Component: engine
2016-07-18 09:47:12 -07:00
Arnaud Porterie 00a715516e Merge pull request #24646 from anusha-ragunathan/use-volume-plugins
Remove use of exec-root in plugins due to socket pathname limits.
Upstream-commit: ba6adc5f46ae1e979551998a02e16e3396a77402
Component: engine
2016-07-18 16:28:22 +00:00
Vincent Demeester 9c80a0e9b9 Merge pull request #24694 from tonistiigi/increase-timeout
Increase timeout for swarm requests
Upstream-commit: 0ec1adf9d1e3f0ea4fdcb98c83753d5575d3c52c
Component: engine
2016-07-18 18:15:37 +02:00
Arnaud Porterie 5c8645e25c Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
Upstream-commit: de64324109d2694b1525e62b5c0072267282a36c
Component: engine
2016-07-18 16:07:23 +00:00
Arnaud Porterie a878f5d7fb Merge pull request #24714 from allencloud/better-docker-network-create-help-output
better command `docker network create -h` output
Upstream-commit: 98a4b3e332b908d5be6f59a0612b597653ccdee0
Component: engine
2016-07-18 16:05:46 +00:00
Brian Goff 8453f0d859 Improve error message for ENOTDIR errors
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 83ae501f1d216600eebf182e7dc29e285c4b10bc
Component: engine
2016-07-18 11:12:33 -04:00
Sebastiaan van Stijn 8a3ff02fe8 Merge pull request #24727 from miaoyq/fix-link-err-in-docs
Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
Upstream-commit: c4d9c828d8ff3f8255e2679899b1bfb5807cdabe
Component: engine
2016-07-18 14:34:20 +02:00
Yanqiang Miao 7065751fcb Fix link errors in 'docs/reference/api/docker_remote_api_v***.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update fix-link-err-in-docs

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: f9ef10f853576d67d73b785deb53ecec84c31e63
Component: engine
2016-07-19 02:53:03 +08:00
Vincent Demeester e904347c82 Merge pull request #24729 from yongtang/24058-api-docs-resource-settings
Fix inconsistent fields for resource settings on service for API docs
Upstream-commit: 4ced001d9aff60dea2c2687c0635cdbe369cd534
Component: engine
2016-07-18 10:20:20 +02:00
Yong Tang 0ad86942d1 Fix inconsistent fields for resource settings on service for API docs
In API docs, `CPU` and `Memory` were used for resource settings on
services. The actual settings should be `NanoCPUs` and `MemoryBytes`.

This fix address the inconsistent fields between API docs and actual
settings.

This fix fixes #24058.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0159ee1f5dcd28dad1f621d17b9321f35f171b29
Component: engine
2016-07-17 16:45:09 -07:00
Sebastiaan van Stijn a95455fc68 Merge pull request #24728 from icaoweiwei/patch_2016-07-17_1
Fix a wrong word in comment.
Upstream-commit: caf8c75572b5815b464806e088a1bb6f366f2ffd
Component: engine
2016-07-17 13:04:27 +02:00
Cao Weiwei 8db8376b96 Fix a wrong word in comment.
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
Upstream-commit: 9be8bf019419be76e9582188888b80b0940abf74
Component: engine
2016-07-17 13:08:07 +08:00
Doug Davis c693ed0c56 Merge pull request #24723 from icaoweiwei/patch_2016-07-16_2
Fix a syntax error in comments
Upstream-commit: b23fc63f048240cb9714f36c3da6fbf85e1a145d
Component: engine
2016-07-16 12:07:54 -04:00
Cao Weiwei c1bbe8252f Fix a syntax error in comments
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
Upstream-commit: 3fc9a9ccb8ec8783bfcc02b7e4dfd7ee6468fa86
Component: engine
2016-07-16 22:41:04 +08:00
Sebastiaan van Stijn 732210c70a Merge pull request #24718 from thaJeztah/fix-oracle-support-link
docs: update Oracle support link
Upstream-commit: 41391233e295e7a23dbbf4af4bcbae5b4d011d6a
Component: engine
2016-07-16 15:26:04 +02:00
Sebastiaan van Stijn a5d67e2744 docs: update Oracle support link
The none-https url results in a redirect
to https://support.oracle.com/epmos/faces/MosIndex.jspx?......
which our link-checker didn't like.

The https link looks to be a direct link,
and not resulting in a redirect, so updating the URL.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c15144c4ec25df4234129fbe88b89cd4f709f784
Component: engine
2016-07-16 14:34:07 +02:00
Doug Davis 8973dbc341 Merge pull request #24715 from allencloud/fix-creats-into-creates-in-comments
fix typo creats into creates in comments
Upstream-commit: 792adb7199634941d1151c798a267918d9a6aa7a
Component: engine
2016-07-16 07:15:37 -04:00
allencloud 1a39748b71 fix typo creats into creates in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0d459f5ed3138f6273c4f10d4796197faaf1ad2d
Component: engine
2016-07-16 17:55:18 +08:00
allencloud cd03aec1cb better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
2016-07-16 15:32:17 +08:00
Stephen J Day aa2ddf3393 swarm: add log driver support for services
Adds log driver support for service creation and update. Add flags
`--log-driver` and `--log-opt` to match `docker run`. Log drivers are
configured per service.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: e778ba2d5b1e5074fe413dffaa365f3d37b175c7
Component: engine
2016-07-15 21:39:27 -07:00
Sebastiaan van Stijn cff2c54d47 Merge pull request #24682 from justincormack/oom-score-adj-doc
Document --oom-score-adj flag in docker run
Upstream-commit: 9ad857a78879420308a935ad80881311bc5e261f
Component: engine
2016-07-16 03:00:51 +02:00
Sebastiaan van Stijn 3172da7b30 Merge pull request #24599 from vdemeester/small-zsh-completion-fix
Small zsh completion fix on --pretty & --no-resolve
Upstream-commit: ff1040bafc6a01d46c50b004f10d24a180c5f319
Component: engine
2016-07-16 02:55:32 +02:00
Sebastiaan van Stijn bfc9affa26 Merge pull request #24280 from miaoyq/24261-fix-make-docker-py-err
Fix 'make test-docker-py' error
Upstream-commit: 13fcbe3d53d3baab4391b23db3e48b4aad877eaa
Component: engine
2016-07-16 02:07:23 +02:00
Sebastiaan van Stijn c4e34ed5c5 Improve flag help consistency, and update docs
This adds the `--live-restore` option to the documentation.

Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01
Component: engine
2016-07-16 01:58:01 +02:00
Tibor Vass c271a4e497 Merge pull request #24699 from dnephin/fixes_to_service_inspect
Only show port name if set
Upstream-commit: 8a0acaa5126ff0afd4588ffa76dd31e325ac359c
Component: engine
2016-07-15 16:02:02 -07:00
Sebastiaan van Stijn 7d15ca738c Merge pull request #24702 from londoncalling/fix-toolbox-description-docs
fixed cut-and-paste error on description of Docker Toolbox
Upstream-commit: 80965a35c1c571ff3fcfa1d7423f784aa703728d
Component: engine
2016-07-15 23:09:06 +02:00
Victoria Bialas 25e8fa8dc7 fixed cut-and-paste error on description of Docker Toolbox
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 6f9e310831326b8031a3526282ffd82cee94294f
Component: engine
2016-07-15 13:54:34 -07:00
Daniel Nephin 6f7cdfbda7 Only show port name if set.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 909c596fa5956ed02b4708a437a828a2829c9bd5
Component: engine
2016-07-15 16:02:04 -04:00
Tonis Tiigi ffdb429522 Increase timeout for swarm requests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 85b1fdf15ce2ad1b373748554d3aa218e2eb5a5f
Component: engine
2016-07-15 11:03:08 -07:00
Sebastiaan van Stijn dccb2477f1 Merge pull request #24610 from sfsmithcha/rc4_tutorial_check
update create swarm and add nodes to use the auto-generated join command
Upstream-commit: 9a9fc01af8fb5d98b8eec0740716226fadb3735c
Component: engine
2016-07-15 19:09:36 +02:00
Michael Crosby 43384c919c Merge pull request #24690 from thaJeztah/add-new-maintainers
Add new maintainers
Upstream-commit: 50b3595697fbcb7fa4f963deb5f241d2b936e7c6
Component: engine
2016-07-15 09:49:30 -07:00
Anusha Ragunathan 0633dc391e Remove use of exec-root in plugins due to socket pathname limits.
Unix sockets are limited to 108 bytes. As a result, we need to be
careful in not using exec-root as the parent directory for pluginID
(which is already 64 bytes), since it can result in socket path names
longer than 108 bytes. Use /tmp instead. Before this change, setting:
- dockerd --exec-root=/go/src/github.com/do passes
- dockerd --exec-root=/go/src/github.com/doc fails
After this change, there's no failure.

Also, write a volume plugins test to verify that the plugins socket
responds.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 21ecd5a93db34288c0c579d5738030716d7bef2d
Component: engine
2016-07-15 09:17:29 -07:00
Alexander Morozov c913339476 Merge pull request #24676 from coolljt0725/fix_24674
Fix daemon panic use wrong graphdriver with --live-restore flag
Upstream-commit: f553362ae5be45d5e2eaff4b3a9d89fa796052da
Component: engine
2016-07-15 08:44:01 -07:00
Alexander Morozov e65f86d46e Merge pull request #24642 from tonistiigi/wait-open
Wait for the reader fifo opening to block
Upstream-commit: c562e3d7688e14c537be992e4b17486335c32577
Component: engine
2016-07-15 08:42:18 -07:00
Sebastiaan van Stijn aa4d3ecd63 Add new maintainers
As voted on per e-mail, adding
new maintainers to the list

Welcome!

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d4b932131a9a1f2bb532e930255a01d040bcc77c
Component: engine
2016-07-15 17:34:26 +02:00
Vincent Demeester d1f2c3f2ad Merge pull request #24638 from miaoyq/fix-docs-err
Delete  redundant content of 'docs/extend/plugins.md'
Upstream-commit: 80ec9fa284c22bc0df617c3d55c49cbbddfb8bb8
Component: engine
2016-07-15 17:04:11 +02:00