beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29483 commits 14 branches 412 tags 338 MiB
Commit graph

355 commits

Author SHA1 Message Date
Sebastiaan van Stijn
a3be176f13 Merge pull request #28922 from yuexiao-wang/fix-secret 
Fix the inconsistency for secret ls and secrect rm
 2016-12-01 11:29:58 +01:00
yuexiao-wang
5cef55ba91 Fix the use for secret create 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-01 19:48:33 +08:00
Alexander Morozov
53d69aeb74 Merge pull request #28885 from vdemeester/revert-service-ps-all 
Revert "Add -a option to service/node ps"
 2016-11-30 12:02:34 -08:00
yuexiao-wang
b4306588e9 Fix the inconsistency for docker secret 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-30 17:23:39 +08:00
Victor Vieux
b8dac5dc99 Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks 
stack deploy: handle external network when deploying
 2016-11-29 15:00:35 -08:00
Vincent Demeester
063d5679c5 Merge pull request #28919 from allencloud/change-secret-remove-in-cli 
change secret remove logic in cli
 2016-11-29 15:08:24 +01:00
Vincent Demeester
986740691f Merge pull request #28874 from yuexiao-wang/fix-layer-typo 
Fix some typos
 2016-11-29 14:45:08 +01:00
yuexiao-wang
c8c7a3ff21 Fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-30 03:01:32 +08:00
Sebastiaan van Stijn
d5654a8e76 Merge pull request #28904 from dnephin/add-volume-labels-to-deploy 
Use namespace label on stack volumes
 2016-11-29 14:39:26 +01:00
allencloud
5b93e77138 change secret remove logic in cli 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-29 15:12:05 +08:00
Daniel Nephin
4013a7c6d8 Use namespace label on stack volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-28 18:02:39 -05:00
John Howard
dfeaf7a959 Align output of docker version again 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 11:38:58 -08:00
Vincent Demeester
eb55d03f3c
Revert "Add -a option to service/node ps" 
This reverts commit 139fff2bf0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 18:08:45 +01:00
Vincent Demeester
b20bf510e5 Merge pull request #28822 from yuexiao-wang/modify-plugin 
Modify repoName to PLUGIN for docker plugin create
 2016-11-28 17:52:04 +01:00
Vincent Demeester
6fff845409
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>
 2016-11-28 17:38:41 +01:00
Kei Ohmura
3abee1bf8a fix description of 'docker swarm init' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
 2016-11-28 13:24:02 +09:00
Antonio Murdaca
ce0068ed04 Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
 2016-11-26 14:34:30 +01:00
Vincent Demeester
c36c63b308 Merge pull request #28815 from dnephin/add-short-option 
Add a short flag for docker stack deploy
 2016-11-25 21:18:09 +01:00
Daniel Nephin
f1dd721b69 Add a short flag for docker stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-25 13:23:36 -05:00
yuexiao-wang
c394034f59 Modify reponame to PLUGIN and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-25 23:09:46 +08:00
Daniel Nephin
1c65cb6657 Allow hostname to be updated on service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-24 15:44:35 -05:00
Yong Tang
2510f254ee 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>
 2016-11-24 08:14:36 -08:00
yuexiao-wang
9e414bfa6b Add options for docker plugin enable and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-25 04:07:06 +08:00
Victor Vieux
f70470b71e support src in --secret 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-23 14:30:57 -08:00
Vincent Demeester
205291c5f3 Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy 
Better error message on stack deploy when not a swarm manager
 2016-11-23 22:47:13 +01:00
Daniel Nephin
c72daf953a Better error message on stack deploy against not a swarm. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 12:15:11 -05:00
erxian
d87c91e39f update secret command 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-23 10:07:09 -05:00
Victor Vieux
7c6f001248 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect 
Update secret inspect to support IDs
 2016-11-22 17:39:48 -08:00
cyli
2c0613540a Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:13:27 -05:00
Evan Hazlett
70d2cefd51 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>
 2016-11-22 16:01:16 -05:00
Tibor Vass
677e14643c Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
 2016-11-22 10:17:10 -08:00
Vincent Demeester
c8388a52ec Merge pull request #28445 from cpuguy83/28439_fix_client_rm_on_old_daemons 
Handle `run --rm` against older daemons on the cli
 2016-11-22 14:25:03 +01:00
Vincent Demeester
d1258c761a Merge pull request #28659 from xuzhenglun/master 
bugfix: incorrect ErrConnectFailed Comparison
 2016-11-22 13:01:05 +01:00
Reficul
d5dc9b8b1f
fix incorrect ErrConnectFailed comparison 
Signed-off-by: Reficul <xuzhenglun@gmail.com>
 2016-11-22 10:42:55 +08:00
Brian Goff
f4bb8c51de 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>
 2016-11-21 20:39:04 -05:00
Victor Vieux
eac91a19d6 Merge pull request #28677 from dnephin/remove-deploy-experimental 
Move `docker stack` out of experimental
 2016-11-21 14:33:35 -08:00
Victor Vieux
99a7289632 Merge pull request #28328 from aaronlehmann/duration-opts 
cli: Add valid suffixes for remaining duration options
 2016-11-21 14:03:00 -08:00
Victor Vieux
3a6829257e Merge pull request #28504 from runcom/fix-info-route-secopt 
api: types: do not remove old SecurityOptions struct
 2016-11-21 13:55:07 -08:00
Anusha Ragunathan
83ca993c15 Add HTTP client timeout. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-21 13:11:40 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
Daniel Nephin
6df5baf30f Move docker stack out of experimental 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-21 15:30:25 -05:00
Vincent Demeester
158388ef8d
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>
 2016-11-21 17:59:29 +01:00
Vincent Demeester
278e01d6de Merge pull request #28539 from nishanttotla/pin-image-digest-ux 
Suppressing digest for docker service ls/ps
 2016-11-21 14:06:37 +01:00
Vincent Demeester
3739c3bed3 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck 
Add support for healthcheck in compose to swarm
 2016-11-21 10:28:37 +01:00
Antonio Murdaca
514ca09426
api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-19 13:21:16 +01:00
Sebastiaan van Stijn
f1b9df9172
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 f32869d956
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>
 2016-11-18 22:04:27 +01:00
Nishant Totla
e7d83fdb9a
Suppressing digest for docker service ls/ps 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-11-18 09:39:34 -08:00
Aaron Lehmann
948e60691e 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>
 2016-11-18 09:31:31 -08:00
Daniel Nephin
7c1b399235 Default parallelism to 1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-18 16:17:08 +01:00
Vincent Demeester
3bd64de7a9
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>
 2016-11-18 15:09:13 +01:00