0171a79c56
update secret command
...
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-23 10:07:09 -05:00
d8787ecd81
Merge pull request #28716 from ehazlett/fix-multi-secret-inspect
...
Update secret inspect to support IDs
2016-11-22 17:39:48 -08:00
357cabef2d
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
36a1664cd4
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
2016-11-22 22:47:38 +01:00
46cd1fa87b
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
e0ad93a836
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
7cc80114de
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
4d87ef4432
Merge pull request #28529 from allencloud/update-secret-create-url
...
fix secret create url for consistency
2016-11-22 09:55:17 -08:00
1318c8dcb4
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
9c9ae79e64
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 12:49:38 +00:00
2a9b8737a5
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
2016-11-22 13:11:37 +01:00
7d0f584f54
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
2016-11-22 13:01:05 +01:00
800c0e20ce
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
2016-11-22 13:01:05 +01:00
14770269e8
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com>
2016-11-22 10:42:55 +08:00
b35205ed12
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com>
2016-11-22 10:42:55 +08:00
4632a029d9
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
4e4541540f
First header should be a top level header
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-22 09:33:21 +08:00
23c399dd10
Merge pull request #28677 from dnephin/remove-deploy-experimental
...
Move `docker stack` out of experimental
2016-11-21 14:33:35 -08:00
07c896b18e
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
2016-11-21 14:03:00 -08:00
e6dc69b4ee
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
2d66496a2b
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
752a9a7c56
Add HTTP client timeout.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-21 13:11:40 -08:00
43e89b5387
Add HTTP client timeout.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-21 13:11:40 -08:00
2d7ef04a57
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
e1b5bdd768
Move docker stack out of experimental
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-21 15:30:25 -05:00
2638cd6f3d
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
89703a0196
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
20ded0afd9
Bugfix: set cli.manualOverride when env var not empty
...
If env var "DOCKER_API_VERSION" is specified by user, we'll set
`cli.manualOverride`, before this, this field is always true due to
wrong logic.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-11-21 17:31:46 +08:00
4e343ae989
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
b4fe4fb42b
api: types: keep info.SecurityOptions a string slice
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-19 13:21:16 +01:00
123d33d81d
api: types: keep info.SecurityOptions a string slice
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-19 13:21:16 +01:00
4d1209844f
Merge pull request #28611 from vieux/fix_golint
...
fix a few golint errors
2016-11-19 07:16:44 -05:00
40acabdfe9
fix a few golint errors
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-18 18:32:02 -08:00
82804cc8e5
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>
2016-11-18 22:04:27 +01:00
5f1209bf4b
Suppressing digest for docker service ls/ps
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-18 09:39:34 -08:00
b58a973b18
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
b866fa77f4
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
c682f10a8f
Default parallelism to 1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-18 16:17:08 +01:00
e21f4f9996
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
dd8712c634
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
2016-11-18 13:02:40 +01:00
e360a30a41
Merge pull request #28540 from lixiaobing10051267/masterNewContainerId
...
expected new_container_id while testing ContainerCommit
2016-11-18 12:13:30 +01:00
cc36bf62ef
Change the docker-tag usage text to be clearer
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2016-11-18 10:34:02 +02:00
e98be4c62f
expected new_container_id while testing ContainerCommit
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-18 10:21:04 +08:00
42788cad9c
update secret create url for consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-18 10:18:21 +08:00
e59facceb7
Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template
...
Use `map[string]bool` for `preProcessor` to ignore unknown fields
2016-11-17 15:13:02 -08:00
1ab47a8be8
error on cli when trying to use experimental feature with non experimental daemon
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-17 14:52:01 -08:00
4e4b58fbcb
Merge pull request #28554 from vieux/showhelp
...
refactor help func in CLI
2016-11-17 14:27:26 -08:00
bc542f365c
do not force target type for secret references
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
use secret store interface instead of embedded secret data into container
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-11-17 15:49:02 -05:00
a7987ef105
Merge pull request #28538 from yongtang/11162016-Log-Logf-fix
...
Fix several issues with `go vet` and `gofmt -s`
2016-11-17 15:21:22 -05:00
05ddb16e59
refactor help func in CLI
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-17 10:54:10 -08:00
erxian
Victor Vieux
cyli
Sebastiaan van Stijn
Evan Hazlett
Tibor Vass
Vincent Demeester
Ben Firshman
Reficul
Brian Goff
yupeng
Anusha Ragunathan
Daniel Nephin
Zhang Wei
Antonio Murdaca
Doug Davis
Sebastiaan van Stijn
Nishant Totla
Aaron Lehmann
Boaz Shuster
lixiaobing10051267
allencloud
Michael Crosby
Tõnis Tiigi