Commit Graph
209 Commits
Author SHA1 Message Date
allencloud 0cbbc04944 make every node and plugin removal call api
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 49512f901c
Component: cli
2016-10-19 06:40:30 +08:00
Justin Cormack cb9c9cdbfa Merge pull request #27476 from yuexiao-wang/fix-typos-volume
Fix some typos
Upstream-commit: 879b4d1fba
Component: cli
2016-10-18 13:50:20 +01:00
Justin Cormack 1f163ad243 Merge pull request #27478 from allencloud/wrap-line-in-deleted-containers
wrap line in deleted containers when pruning
Upstream-commit: d52f04b7c1
Component: cli
2016-10-18 13:48:44 +01:00
Vincent Demeester cd9add9cd9 Merge pull request #22566 from yongtang/22471-daemon-shutdown-timeout
Add config parameter to change per-container stop timeout during daemon shutdown
Upstream-commit: 3eeb334ccc
Component: cli
2016-10-18 14:33:09 +02:00
yuexiao-wang 655c82e562 Fix typs from go to Go
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 24d0191a3a
Component: cli
2016-10-18 19:40:16 +08:00
allencloud 52dbab66cb wrap line in deleted containers when pruning
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 093072cc18
Component: cli
2016-10-18 14:20:12 +08:00
Justin Cormack 67d2ba7359 Merge pull request #26519 from AkihiroSuda/fix-cli-command-formatter-json-support
Fix broken JSON support in cli/command/formatter
Upstream-commit: 3ab6e03ba3
Component: cli
2016-10-17 22:44:04 +01:00
Yong Tang a195f2d433 Update docker stop and docker restart to allow not specifying timeout and use the one specified at container creation time.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c424fb0e3d
Component: cli
2016-10-17 12:53:35 -07:00
Vincent Demeester fc18090688 Revert docker volume column name to VOLUME_NAME
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6c3c3a87ba
Component: cli
2016-10-17 20:03:31 +02:00
Vincent Demeester 2039fb87db Merge pull request #27074 from cyli/bump-notary-version
Bump notary version to 0.4.2
Upstream-commit: 6566662d1b
Component: cli
2016-10-17 16:35:57 +02:00
Akihiro Suda f0fd68b09c Fix broken JSON support in cli/command/formatter
How to test:

    $ docker ps --format '{{json .}}'
    $ docker network ls --format '{{json .}}'
    $ docker volume ls --format '{{json .}}'

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: c11155f0d1
Component: cli
2016-10-17 08:07:17 +00:00
Vincent Demeester 959e595471 Merge pull request #27236 from allencloud/return-nil-when-no-node-or-service
return nil when no node or service to avoid additional api call
Upstream-commit: cfc3b1a3ff
Component: cli
2016-10-16 18:41:31 +02:00
cyli 1ce580f929 Fix API incompatibilities between notary v0.3.0 and v0.4.2:
- some function signatures have changed - use the new ones
- re-generate the notary delegation key certs, since notary doesn't allow SHA1
- fix some error message mapping because now if a root rotation fails to validate trusted operations will fail

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 43d7c0ed9a
Component: cli
2016-10-14 17:53:34 -07:00
Yong Tang da9c666ce4 Allow docker deploy command accept filename with/without extension
This fix tries to address the issue raised in 25855 where the command
`docker deploy` can only accept a STACK without extension of `.dab`.
In other words, `docker deploy hellojavaee.dab` gives an error:
```
Bundle hellojavaee.dab.dab not found. Specify the path with --file
```

This fix updates the way namespace STACK is taken so that in case
`STACK.dab` is provided with `docker deploy`:
```
$ docker deploy STACK.dab
```
The `STACK` is used as namespace (instead of `STACK.dab`).

NOTE: This fix will only allows `.dab` extension in namespace, because
it is not possible to have a namespace with `.` in the middle. In other
words, a namespace `hello.java.ee` will not work anyway (whether the file
`hello.java.ee` exists or not).

An additional integration test has been added to cover the changes.

This fix fixes 25855.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0cb01799e9
Component: cli
2016-10-14 11:44:15 -07:00
Sebastiaan van Stijn cd94ff3934 Merge pull request #27333 from yongtang/27049-ListOpt
Use ListOpt for `docker network create --label` and `docker volume create --label`
Upstream-commit: b2de6e55bd
Component: cli
2016-10-14 00:31:09 -07:00
Sebastiaan van Stijn 17ee92cc91 Merge pull request #26819 from ripcurld00d/fix_stats_mutex
Hide the mutex lock in formatter.ContainerStats
Upstream-commit: bfe16dcfe2
Component: cli
2016-10-13 17:38:22 -07:00
Alexander Morozov 33a7a92490 Merge pull request #27338 from yuexiao-wang/instream-err
Fix the incorrect description for NewInStream
Upstream-commit: 5eef6637ef
Component: cli
2016-10-13 12:32:43 -07:00
Tõnis Tiigi d115bbf349 Merge pull request #27276 from yuexiao-wang/func-name
Modify function name from SetDaemonLogLevel to SetLogLevel
Upstream-commit: 1f17f52314
Component: cli
2016-10-13 12:10:59 -07:00
yuexiao-wang 939ccb7483 Fix the incorrect description for NewInStream
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b6fbe832ac
Component: cli
2016-10-13 22:33:09 +08:00
Yong Tang c5a9a16056 Use ListOpt for docker network create --label and docker volume create --label
This fix is related to 27049 and 27047. For `--label` flag, if string slice is
used (like 27047), then quote can not be used in command and will result in
an error :
```
line 1, column 14: bare " in non-quoted-field
```

The issue 27047 has been fixed by 27049.

Recently I found out that both `docker network create --label` and `docker volume create --label`
still use string slice and will return the same error when quotes are used.

This fix fixes `docker network create --label` and `docker volume create --label`
by using `ListOpt` (as 27049) as well.

This fix has been tested and verified manually.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 49e49e8e00
Component: cli
2016-10-12 16:06:34 -07:00
Sebastiaan van Stijn 52bff40f0e Merge pull request #27294 from mlaventure/hide-unused-volume-fields
Move types.Volumes optional fields under a new type
Upstream-commit: 2e2f16a621
Component: cli
2016-10-11 23:55:25 +02:00
Kenfe-Mickael Laventure bf3fe75f3b Move types.Volumes optional fields under a new type
This allows us to hide those fields when they are not filled.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 5018781cab
Component: cli
2016-10-11 11:49:26 -07:00
yuexiao-wang cd04735ef7 Modify function name from SetDaemonLogLevel to SetLogLevel
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: f4267969c7
Component: cli
2016-10-11 19:35:12 +08:00
Sebastiaan van Stijn ddca0b9760 Merge pull request #26894 from thaJeztah/improve-log-level-help
Improve --log-level help text
Upstream-commit: bc50354deb
Component: cli
2016-10-11 12:35:42 +02:00
allencloud fcc2ad15e7 return nil when no node or service to avoid additional api call
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6ef1c7deaf
Component: cli
2016-10-11 10:59:16 +08:00
Sebastiaan van Stijn 9fad962ff9 Improve --log-level help text
This information was added in
1efc940e6f547760e5e8f4648acb120ff19fdc58,
but removed again in
a271eaeba224652e3a12af0287afbae6f82a9333
to make the help-output fit in a 80-chars
terminal.

This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bed046666a
Component: cli
2016-10-10 23:10:17 +02:00
Boaz Shuster 1c68035702 Hide the mutex in formatter.ContainerStats
The formatter.ContainerStats struct exposes its Mutex.
This is a bad design and should be fixed.

To fix that, I separated the statistics
attributes from ContainerStats to StatsEntry and
hid the mutex. Notice that the mutex protects both
the `err` field and the statistics attributes.

Then, implemented SetStatistics, SetError, GetStatistics
and GetError to avoid races.

Moreover, to make this less granular, I decided to
replace the read-write mutex with the regular mutex and
to pass a StatsEntry slice to formatter.ContainerStatsWrite

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 3bc50c45ba
Component: cli
2016-10-10 21:52:53 +03:00
allencloud b9c5442c91 better prune and system df
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 871b692833
Component: cli
2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn 879f289e5a Merge pull request #26778 from WeiZhang555/parallel-operations
Support parallel kill,rm
Upstream-commit: 0c6d66b89a
Component: cli
2016-10-10 18:31:10 +02:00
yuexiao-wang 7f7622756e Add the OPTIONS and Fix the links for contain prune
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 80bc917226
Component: cli
2016-10-11 00:13:33 +08:00
John Howard 9d0867981a Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e307da732a
Component: cli
2016-10-06 09:32:22 -07:00
Alexander Morozov 69602c283c Merge pull request #25837 from reaperhulk/support-compressing-build-context
Add support for compressing build context during image build
Upstream-commit: 8691f7c542
Component: cli
2016-10-05 12:57:46 -07:00
Arnaud Porterie 55fc58e15f Merge pull request #26108 from mlaventure/data-mngt
New Data Management commands
Upstream-commit: 71ffe11776
Component: cli
2016-10-01 03:17:18 +00:00
Paul Kehrer ad88944cf1 Add support for compressing build context during image build
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."

Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com>
Upstream-commit: e25646bbc0
Component: cli
2016-09-30 17:46:08 -05:00
Sebastiaan van Stijn f93c39a901 Merge pull request #27049 from dnephin/fix-label-flag-type
Use ListOpt for build labels
Upstream-commit: ebfd0d6602
Component: cli
2016-09-30 23:40:08 +02:00
Kenfe-Mickael Laventure 326cca001f Add new df subcomand to the system command
This command display the state of the data usage of the docker daemon.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 3f8c4be283
Component: cli
2016-09-30 14:35:23 -07:00
Vincent Demeester 8ba28247b6 Merge pull request #26697 from allencloud/change-service-scale-logic
validate service parameter in client side to avoid api call in `docker service scale`
Upstream-commit: e2870295aa
Component: cli
2016-09-30 18:37:35 +02:00
Daniel Nephin 8d6b5149c7 Use ListOpt for labels.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d6b5a807d7
Component: cli
2016-09-29 17:59:52 -04:00
Kenfe-Mickael Laventure c80b266f91 Add subcommand prune to the container, volume, image and system commands
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6f8bb41ecb
Component: cli
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure 6713fa0784 Update Images() to allow retrieving specific image size data
Those data include:
 - size of data shared with other images
 - size of data unique to a given image
 - how many containers are using a given image

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 82dc15836b
Component: cli
2016-09-29 07:42:53 -07:00
allencloud d882807966 add \n in engine labels display in docker node inspect xxx --pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 65b1e54c73
Component: cli
2016-09-29 18:17:54 +08:00
Vincent Demeester 4c5ae70968 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: 5ca7909308
Component: cli
2016-09-28 11:50:27 +02:00
Zhang Wei cf39dde222 Support parallel rm
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 5c1362ce59
Component: cli
2016-09-28 12:07:18 +08:00
Zhang Wei 03427eb002 Support parallel kill
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: f612b93d33
Component: cli
2016-09-28 12:03:19 +08:00
Brian Goff a0d7480769 Merge pull request #26951 from AkihiroSuda/update-ut-cli-command-service
Fix cli/command/service/opts_test.go, and add some extra test cases
Upstream-commit: 715d301f12
Component: cli
2016-09-27 20:30:26 -04:00
Vincent Demeester 459d502275 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: bf824fee21
Component: cli
2016-09-27 18:46:51 +02:00
Vincent Demeester 72959f648d Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
add endpoint mode in service pretty
Upstream-commit: b322c8e506
Component: cli
2016-09-27 18:28:43 +02:00
Akihiro Suda 841efb11eb Fix cli/command/service/opts_test.go, and add some extra test cases
`m.Set("type=volume,target=/foo,volume-nocopy")` is valid even though it lacks "source"

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 2126d8160d
Component: cli
2016-09-27 15:27:02 +00:00
Yong Tang c8b419cfef Let swarmkit handle cluster defaults in swarm init if not specified
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e0f229d2ca
Component: cli
2016-09-27 04:19:38 -07:00
allencloud 64b2b3acec add endpoint mode in service pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cc375fafd0
Component: cli
2016-09-27 18:41:19 +08:00