cefbd9b7e9
Merge pull request #28885 from vdemeester/revert-service-ps-all
...
Revert "Add -a option to service/node ps"
Upstream-commit: 53d69aeb74962709464e0888f4a5c755be2c8e4d
Component: engine
2016-11-30 12:02:34 -08:00
5ee1b1203e
Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks
...
stack deploy: handle external network when deploying
Upstream-commit: b8dac5dc995cefbd9f92f5a52a7435ddf4250873
Component: engine
2016-11-29 15:00:35 -08:00
ce99f23b28
Merge pull request #28919 from allencloud/change-secret-remove-in-cli
...
change secret remove logic in cli
Upstream-commit: 063d5679c5662c260cd7d53efc10da0a835366e0
Component: engine
2016-11-29 15:08:24 +01:00
89bc275c16
Merge pull request #28874 from yuexiao-wang/fix-layer-typo
...
Fix some typos
Upstream-commit: 986740691fa38143d8a6ec9d65846feae6221076
Component: engine
2016-11-29 14:45:08 +01:00
bdb282b28d
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c8c7a3ff2112a1b17a06fc02633ed7b49a8aebf3
Component: engine
2016-11-30 03:01:32 +08:00
8074d9c4a5
Merge pull request #28904 from dnephin/add-volume-labels-to-deploy
...
Use namespace label on stack volumes
Upstream-commit: d5654a8e76e9dea770751d02ecfad4123cf724f4
Component: engine
2016-11-29 14:39:26 +01:00
ad81663166
change secret remove logic in cli
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b93e77138f19d30245a3e0f9f8f834aa67458ec
Component: engine
2016-11-29 15:12:05 +08:00
2ae9ad9ad5
Use namespace label on stack volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4013a7c6d897051bb79982230f31279ee0c9a026
Component: engine
2016-11-28 18:02:39 -05:00
52fcb6e953
Align output of docker version again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dfeaf7a959cf619f5460c88e7bc1fe5ce40d50a7
Component: engine
2016-11-28 11:38:58 -08:00
871ee3d12b
Revert "Add -a option to service/node ps"
...
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: eb55d03f3c321e31c8da993233b2679f47d5b4e1
Component: engine
2016-11-28 18:08:45 +01:00
526d1ca139
Merge pull request #28822 from yuexiao-wang/modify-plugin
...
Modify repoName to PLUGIN for docker plugin create
Upstream-commit: b20bf510e5ba26320c7f8ff827040b948a9225cd
Component: engine
2016-11-28 17:52:04 +01:00
37ea301199
stack deploy: handle external network when deploying
...
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6fff8454099092780655e8a2c7d71402ce547c5c
Component: engine
2016-11-28 17:38:41 +01:00
541c855701
fix description of 'docker swarm init'
...
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com >
Upstream-commit: 3abee1bf8aad5e24df635d70bceb39c69a1c2407
Component: engine
2016-11-28 13:24:02 +09:00
7ac8174c1e
Merge pull request #28780 from vieux/accept_src_in_secret
...
support src in --secret
Upstream-commit: ce0068ed0483bd87dc4af1e7388d9b9a91431424
Component: engine
2016-11-26 14:34:30 +01:00
3c733b5599
Merge pull request #28815 from dnephin/add-short-option
...
Add a short flag for docker stack deploy
Upstream-commit: c36c63b308acbacefcd088f7bc0b0b68c79d9334
Component: engine
2016-11-25 21:18:09 +01:00
ac43a15799
Add a short flag for docker stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f1dd721b6978f1c24bb2761b88c83d9e385bd781
Component: engine
2016-11-25 13:23:36 -05:00
a2f0c8aa51
Modify reponame to PLUGIN and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c394034f5978862b75770a036364f806bbcd8920
Component: engine
2016-11-25 23:09:46 +08:00
3ecec6e350
Allow hostname to be updated on service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1c65cb6657f1288d6a7e93e0015bba68e6d374cd
Component: engine
2016-11-24 15:44:35 -05:00
6bc43aa829
Update docs of docker network ls --filter
...
Currently the help output of `docker network ls --filter` is:
```
Options:
-f, --filter value Provide filter values (i.e. 'dangling=true') (default [])
...
```
This caused confusion as only the following filters are supported at the moment:
- `driver`
- `type`
- `name`
- `id`
- `label`
This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
-f, --filter filter Provide filter values (i.e. 'driver=bridge')
...
```
This fix fixes 28786.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 2510f254eea58788c1a98987db35294beb839bb4
Component: engine
2016-11-24 08:14:36 -08:00
7de409be5f
Add options for docker plugin enable and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9e414bfa6b26bf919fc7ffbf0cf87814043b328b
Component: engine
2016-11-25 04:07:06 +08:00
c17df6c51f
support src in --secret
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: f70470b71e519012e91137a2512f40d5bb8d18af
Component: engine
2016-11-23 14:30:57 -08:00
ccbfa9c95a
Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy
...
Better error message on stack deploy when not a swarm manager
Upstream-commit: 205291c5f31eb0732aeb04c0489a6b6814afb905
Component: engine
2016-11-23 22:47:13 +01:00
64466e9e79
Better error message on stack deploy against not a swarm.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c72daf953aaa8c7c8cbe60a103700d3b1d56c50d
Component: engine
2016-11-23 12:15:11 -05:00
99086026bc
update secret command
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: d87c91e39ff0d3defb5b98fdc9275c8c0bfc987e
Component: engine
2016-11-23 10:07:09 -05:00
afb23f3459
Merge pull request #28716 from ehazlett/fix-multi-secret-inspect
...
Update secret inspect to support IDs
Upstream-commit: 7c6f001248cb6dffbffad4470caaa96e759cfe26
Component: engine
2016-11-22 17:39:48 -08:00
2e3fe52bff
Do not display the digest or size of swarm secrets
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 2c0613540a25d45069d142542e572bb6338e4155
Component: engine
2016-11-22 18:13:27 -05:00
9e9aefeaf8
update secret inspect to support IDs
...
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets. This also cleans up the
help text for consistency.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 70d2cefd51e853ca4f3bbf8eb0386360809e026b
Component: engine
2016-11-22 16:01:16 -05:00
419cdb27d7
Merge pull request #28595 from anusha-ragunathan/plugin_timeout
...
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: 677e14643c79184ca9d8123dd3e91e0444b1cac3
Component: engine
2016-11-22 10:17:10 -08:00
1e1f7ae102
Merge pull request #28445 from cpuguy83/28439_fix_client_rm_on_old_daemons
...
Handle `run --rm` against older daemons on the cli
Upstream-commit: c8388a52ec7a328b6aee3c48d31bd7f3e0b14aeb
Component: engine
2016-11-22 14:25:03 +01:00
33dbfcc591
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: d1258c761a9d2fac6c7830c77c7d8f91426bada3
Component: engine
2016-11-22 13:01:05 +01:00
3bfc791696
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com >
Upstream-commit: d5dc9b8b1f5e693cfb3aace06e08e7fc6eb798d7
Component: engine
2016-11-22 10:42:55 +08:00
77b1914252
Handle run --rm against older daemons on the cli
...
For previous versions of Docker, `--rm` was handled client side, as such
there was no support in the daemon for it.
Now it is handled daemon side, but we still need to handle the case of a
newer client talking to an older daemon.
Falls back to client-side removal when the daemon does not support it.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f4bb8c51de3a52bdbc3c3e7be426e6bb90feb421
Component: engine
2016-11-21 20:39:04 -05:00
4ce562265c
Merge pull request #28677 from dnephin/remove-deploy-experimental
...
Move `docker stack` out of experimental
Upstream-commit: eac91a19d632dc82b04f19eb11f83ed1dcefb8ae
Component: engine
2016-11-21 14:33:35 -08:00
a4da4522af
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
Upstream-commit: 99a7289632974e4388ee09fbea2038410e713e0b
Component: engine
2016-11-21 14:03:00 -08:00
12ac08ce0b
Merge pull request #28504 from runcom/fix-info-route-secopt
...
api: types: do not remove old SecurityOptions struct
Upstream-commit: 3a6829257e970771a4be99783b93a803946443df
Component: engine
2016-11-21 13:55:07 -08:00
c21adc5da9
Add HTTP client timeout.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 83ca993c154d56e03d6f95a3f8351c48b3ed3e29
Component: engine
2016-11-21 13:11:40 -08:00
f8729bb9ff
Merge pull request #28556 from ehazlett/container-secret-store
...
Fix target reference secrets and container secret store
Upstream-commit: 05963010ee2aa363bcbd6d925918a46dba02fd7d
Component: engine
2016-11-21 21:40:01 +01:00
2beb803d6c
Move docker stack out of experimental
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6df5baf30f96e5af3338551b9e632748d7886ead
Component: engine
2016-11-21 15:30:25 -05:00
2b291d4bab
Do not panic if network is nil
...
network is `nil` if the following case:
```
services:
foo:
image: nginx
networks:
mynetwork:
```
It's a valid compose so we should not panic.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 158388ef8d66723ec1f8ee4770d7488948234d16
Component: engine
2016-11-21 17:59:29 +01:00
a4b2e09289
Merge pull request #28539 from nishanttotla/pin-image-digest-ux
...
Suppressing digest for docker service ls/ps
Upstream-commit: 278e01d6de56e7ffb6f47db9dfca8fdb196a9643
Component: engine
2016-11-21 14:06:37 +01:00
86d2b2a2e1
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 3739c3bed37a3493a20bff3c9abb17561e1a732d
Component: engine
2016-11-21 10:28:37 +01:00
36b43dcc24
api: types: keep info.SecurityOptions a string slice
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 514ca09426e5d023753101ffa6ac3a21b0e0efb5
Component: engine
2016-11-19 13:21:16 +01:00
fd22b67295
swap position of "host" and "ip"
...
the service definition uses the format as defined
in http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])
This format is the _reverse_ of the format used in
the container API.
Commit f32869d956eb175f88fd0b16992d2377d8eae79c
inadvertently used the incorrect order.
This fixes the order, and correctly sets it to;
IP-Address hostname
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f1b9df91722a229fd0cefd7a0868933b6b811544
Component: engine
2016-11-18 22:04:27 +01:00
4be5a5624f
Suppressing digest for docker service ls/ps
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: e7d83fdb9a17c384397e81d7b5a83245b4216f79
Component: engine
2016-11-18 09:39:34 -08:00
2efd6e2078
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
6a67c61a99
Default parallelism to 1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7c1b39923505adeb13512d6294855b31102963a6
Component: engine
2016-11-18 16:17:08 +01:00
65faee61a6
Add support for healthcheck in composefile v3
...
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3bd64de7a9c3eecbd57cb11d861a6fe94a5bb788
Component: engine
2016-11-18 15:09:13 +01:00
c61cce0a3d
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
Upstream-commit: 6c447f552c84cfd1c2840f1f1d3061485aa69d10
Component: engine
2016-11-18 13:02:40 +01:00
af870551d0
Change the docker-tag usage text to be clearer
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 039aca05c2eae8a06dc16ff97110539feb44d13b
Component: engine
2016-11-18 10:34:02 +02:00
02df9fec1f
Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template
...
Use `map[string]bool` for `preProcessor` to ignore unknown fields
Upstream-commit: e61ad7465503a2cfe4c8cfec2f929831c28fd84a
Component: engine
2016-11-17 15:13:02 -08:00
