Commit Graph
4522 Commits
Author SHA1 Message Date
Vincent Demeester 4ded4ce547 Merge pull request #28651 from YuPengZTE/devMD002
First header should be a top level header
Upstream-commit: 2a9b8737a5
Component: cli
2016-11-22 13:11:37 +01:00
Vincent Demeester 5a845e573b Merge pull request #28659 from xuzhenglun/master
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: 7d0f584f54
Component: cli
2016-11-22 13:01:05 +01:00
Vincent Demeester 88bc0e036b Merge pull request #28659 from xuzhenglun/master
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: 800c0e20ce
Component: cli
2016-11-22 13:01:05 +01:00
Reficul a08156a072 fix incorrect ErrConnectFailed comparison
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: 14770269e8
Component: cli
2016-11-22 10:42:55 +08:00
Reficul d9eae8f9b0 fix incorrect ErrConnectFailed comparison
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: b35205ed12
Component: cli
2016-11-22 10:42:55 +08:00
Brian Goff e727185cfe 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: 4632a029d9
Component: cli
2016-11-21 20:39:04 -05:00
yupeng e3969c2cea First header should be a top level header
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 4e4541540f
Component: cli
2016-11-22 09:33:21 +08:00
Victor Vieux f85b33128a Merge pull request #28677 from dnephin/remove-deploy-experimental
Move `docker stack` out of experimental
Upstream-commit: 23c399dd10
Component: cli
2016-11-21 14:33:35 -08:00
Victor Vieux 38b13e5bfa Merge pull request #28328 from aaronlehmann/duration-opts
cli: Add valid suffixes for remaining duration options
Upstream-commit: 07c896b18e
Component: cli
2016-11-21 14:03:00 -08:00
Victor Vieux 3115012a80 Merge pull request #28504 from runcom/fix-info-route-secopt
api: types: do not remove old SecurityOptions struct
Upstream-commit: e6dc69b4ee
Component: cli
2016-11-21 13:55:07 -08:00
Victor Vieux 977760d8eb Merge pull request #28504 from runcom/fix-info-route-secopt
api: types: do not remove old SecurityOptions struct
Upstream-commit: 2d66496a2b
Component: cli
2016-11-21 13:55:07 -08:00
Anusha Ragunathan 3374b2a4b4 Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 752a9a7c56
Component: cli
2016-11-21 13:11:40 -08:00
Anusha Ragunathan d8c70a7d8d Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 43e89b5387
Component: cli
2016-11-21 13:11:40 -08:00
Vincent Demeester 60606c230f Merge pull request #28556 from ehazlett/container-secret-store
Fix target reference secrets and container secret store
Upstream-commit: 2d7ef04a57
Component: cli
2016-11-21 21:40:01 +01:00
Daniel Nephin bc199413c3 Move docker stack out of experimental
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e1b5bdd768
Component: cli
2016-11-21 15:30:25 -05:00
Vincent Demeester df30b2fb86 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: 2638cd6f3d
Component: cli
2016-11-21 17:59:29 +01:00
Vincent Demeester 615421f56d Merge pull request #28539 from nishanttotla/pin-image-digest-ux
Suppressing digest for docker service ls/ps
Upstream-commit: 89703a0196
Component: cli
2016-11-21 14:06:37 +01:00
Zhang Wei cf98c0f30e 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>
Upstream-commit: 20ded0afd9
Component: cli
2016-11-21 17:31:46 +08:00
Vincent Demeester 7970861bba Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
Add support for healthcheck in compose to swarm
Upstream-commit: 4e343ae989
Component: cli
2016-11-21 10:28:37 +01:00
Antonio Murdaca 3c47b1cb86 api: types: keep info.SecurityOptions a string slice
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: b4fe4fb42b
Component: cli
2016-11-19 13:21:16 +01:00
Antonio Murdaca 4efd139636 api: types: keep info.SecurityOptions a string slice
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 123d33d81d
Component: cli
2016-11-19 13:21:16 +01:00
Doug Davis 7365ba4700 Merge pull request #28611 from vieux/fix_golint
fix a few golint errors
Upstream-commit: 4d1209844f
Component: cli
2016-11-19 07:16:44 -05:00
Victor Vieux 08da0db0bf fix a few golint errors
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 40acabdfe9
Component: cli
2016-11-18 18:32:02 -08:00
Sebastiaan van Stijn 607719cae6 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: 82804cc8e5
Component: cli
2016-11-18 22:04:27 +01:00
Nishant Totla 71aa7e39fa Suppressing digest for docker service ls/ps
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 5f1209bf4b
Component: cli
2016-11-18 09:39:34 -08:00
Aaron Lehmann d5535f5557 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: b58a973b18
Component: cli
2016-11-18 09:31:31 -08:00
Aaron Lehmann dee52b4790 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: b866fa77f4
Component: cli
2016-11-18 09:31:31 -08:00
Daniel Nephin 21435bb7d5 Default parallelism to 1.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c682f10a8f
Component: cli
2016-11-18 16:17:08 +01:00
Vincent Demeester 98e2097ade 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: e21f4f9996
Component: cli
2016-11-18 15:09:13 +01:00
Vincent Demeester 6c5a8a992c Merge pull request #28354 from ripcurld00d/tag_creation
Change the docker-tag usage text to be clearer
Upstream-commit: dd8712c634
Component: cli
2016-11-18 13:02:40 +01:00
Vincent Demeester 002f2aed72 Merge pull request #28540 from lixiaobing10051267/masterNewContainerId
expected new_container_id while testing ContainerCommit
Upstream-commit: e360a30a41
Component: cli
2016-11-18 12:13:30 +01:00
Boaz Shuster bdac023521 Change the docker-tag usage text to be clearer
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: cc36bf62ef
Component: cli
2016-11-18 10:34:02 +02:00
lixiaobing10051267 33b6dcd341 expected new_container_id while testing ContainerCommit
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: e98be4c62f
Component: cli
2016-11-18 10:21:04 +08:00
allencloud f186f103bc update secret create url for consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 42788cad9c
Component: cli
2016-11-18 10:18:21 +08:00
Michael Crosby c539a33a54 Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template
Use `map[string]bool` for `preProcessor` to ignore unknown fields
Upstream-commit: e59facceb7
Component: cli
2016-11-17 15:13:02 -08:00
Victor Vieux c0c99dbe13 error on cli when trying to use experimental feature with non experimental daemon
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 1ab47a8be8
Component: cli
2016-11-17 14:52:01 -08:00
Tõnis Tiigi 82ea944d4a Merge pull request #28554 from vieux/showhelp
refactor help func in CLI
Upstream-commit: 4e4b58fbcb
Component: cli
2016-11-17 14:27:26 -08:00
Evan Hazlett fb2ded55b6 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>
Upstream-commit: bc542f365c
Component: cli
2016-11-17 15:49:02 -05:00
Brian Goff 6b6839bd90 Merge pull request #28538 from yongtang/11162016-Log-Logf-fix
Fix several issues with `go vet` and `gofmt -s`
Upstream-commit: a7987ef105
Component: cli
2016-11-17 15:21:22 -05:00
Victor Vieux 3164628a33 refactor help func in CLI
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 05ddb16e59
Component: cli
2016-11-17 10:54:10 -08:00
Victor Vieux 7487e32054 refactor help func in CLI
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 55908f8a82
Component: cli
2016-11-17 10:54:10 -08:00
Yong Tang 7e9ea5342a Fix several issues with go vet and go fmt
For some reason, `go vet` and `go fmt` validate does not capture
several issues.

The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```

The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```

Fixed above issues with `go vet` and `go fmt -s`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d691bce8c9
Component: cli
2016-11-17 06:31:28 -08:00
Sebastiaan van Stijn 49392d9004 Merge pull request #28512 from anusha-ragunathan/fix_enable
Cleanup after plugin install.
Upstream-commit: d9a5f6c80e
Component: cli
2016-11-17 10:16:47 +01:00
Yong Tang 7899bc9ada Fix crash caused by docker service inspect --pretty
This fix tries to fix the crash caused by `docker service inspect --pretty`,
by performing necessary nil pointer check.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4488d9f9fb
Component: cli
2016-11-16 17:26:03 -08:00
Sebastiaan van Stijn 021e1a51ce Merge pull request #28322 from Microsoft/jjh/api1.26
Bump API to v1.26
Upstream-commit: 6e6b37b0a2
Component: cli
2016-11-17 00:01:46 +01:00
Anusha Ragunathan 656a0c42be Cleanup after plugin install.
During error cases, we dont cleanup correctly. This commit takes care
of removing the plugin, if there are errors after the pull passed. It
also shuts down the plugin, if there are errors after the plugin in the
enable path.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 4749582510
Component: cli
2016-11-16 14:45:51 -08:00
Yong Tang 75b9b9e6bd Use map[string]bool for preProcessor to ignore unknwon field
This fix is an attempt to address the issue raised in 28339. In
`docker ps`, the formatter needs to expose all fields of `types.Container`
to `preProcessor` so that template could be executed.

This direct exposing is unreliable and could cause issues as user may incorrectly
assume all fields in `types.Container` will be available for templating.

However, the purpose of `preProcessor` is to only find out if `.Size`
is defined (so that opts.size could be set accordingly).

This fix defines `preProcessor` as `map[string]bool` with a func `Size()`.
In this way, any unknown fields will be ignored.

This fix adds several test cases to the existing `TestBuildContainerListOptions`.

This fix fixes 28339.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3c56459801
Component: cli
2016-11-16 13:23:47 -08:00
Tonis Tiigi cfe7cb61c6 Skip cli initialization for daemon command
Cli initialization pings back to remote API and
creates a deadlock if socket is already being
listened by systemd.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 28f8f92963
Component: cli
2016-11-16 13:19:45 -08:00
Sebastiaan van Stijn 0d64811356 Merge pull request #28272 from Microsoft/jjh/sequentialscan2
Windows: Perf: Use sequential file access
Upstream-commit: 91aed2e673
Component: cli
2016-11-16 00:47:19 +01:00
Sebastiaan van Stijn 3bfbb64933 Merge pull request #26868 from Microsoft/jjh/deprecateemail
1.14 deprecation: email from login
Upstream-commit: 66d50e5695
Component: cli
2016-11-15 13:08:05 +01:00