Commit Graph

690 Commits

Author SHA1 Message Date
876db3d882 Merge pull request #32496 from tonistiigi/build-target
builder: add an option for specifying build target
Upstream-commit: f2b5c1e4c6
Component: cli
2017-04-10 19:02:21 -07:00
1bd853679b Merge pull request #32462 from dperny/service-logs-general-availability
Remove experimental from service logs
Upstream-commit: 7a0d2dbcc2
Component: cli
2017-04-10 18:30:20 -07:00
d8b8669d05 Merge pull request #32110 from adshmh/30977-stack-rm-should-accept-multiple-labels
stack rm should accept multiple arguments
Upstream-commit: 988d88530b
Component: cli
2017-04-10 18:19:59 -07:00
16c13bab18 builder: add an option for specifying build target
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ae43081d1d
Component: cli
2017-04-10 16:21:43 -07:00
33114e5cf5 Merge pull request #32116 from mkumatag/inspect_template
Adopt text/template in node inspect
Upstream-commit: d8dee941c1
Component: cli
2017-04-10 23:02:26 +02:00
b75841303e Remove experimental from service logs
Service logs API is now stable. Service logs now support all features,
except retrieving details provided to the log driver.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: a29c0a6418
Component: cli
2017-04-10 13:40:45 -07:00
e2232fefd3 Merge pull request #31236 from tonistiigi/docker-stdin
build: accept -f - to read Dockerfile from stdin
Upstream-commit: eddc5b9d9e
Component: cli
2017-04-10 20:14:54 +02:00
2e6cb8b129 Merge pull request #31148 from yongtang/31032-NanoCPU-update
Add `--cpus` support for `docker update`
Upstream-commit: 3524ac8f76
Component: cli
2017-04-10 20:02:15 +02:00
52dc5ab75d Merge pull request #30740 from yongtang/29999-prune-filter-label
Add `label` filter for `docker system prune`
Upstream-commit: ec9d4dbdc6
Component: cli
2017-04-10 19:38:01 +02:00
91bf27ffd0 Merge pull request #32427 from adshmh/add-unit-tests-to-cli-command-idresolver-package
Added unit tests to the cli/command/idresolver package
Upstream-commit: 22c1cbe611
Component: cli
2017-04-10 12:41:09 -04:00
e50f7bc874 Adopt text/template in node inspect
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
Upstream-commit: a484e4eb5f
Component: cli
2017-04-10 17:47:15 +05:30
2afc69443a Merge pull request #32062 from aaronlehmann/change-network-attachments
Support service network attachment changes
Upstream-commit: 3757275eee
Component: cli
2017-04-10 12:49:28 +02:00
5c7c44fc53 Merge pull request #31364 from adshmh/30935-use-encrypted-client-certificate-to-connect-to-a-docker-host
use an encrypted client certificate to connect to a docker daemon
Upstream-commit: 666a23aac2
Component: cli
2017-04-10 10:42:01 +02:00
d5e589cf02 Added unit tests to the cli/command/idresolver package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: dea478b851
Component: cli
2017-04-07 23:23:39 -04:00
8c22ac9602 Show network names in "docker service inspect --pretty"
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 008f6d1b3f
Component: cli
2017-04-07 16:46:25 -07:00
d9f91ded10 cli: Allow service's networks to be updated
Resolve networks IDs on the client side.

Avoid filling in deprecated Spec.Networks field.

Sort networks in the TaskSpec for update stability.

Add an integration test for changing service networks.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 808ca15347
Component: cli
2017-04-07 16:46:25 -07:00
94a0b24057 Merge pull request #32339 from aluzzardi/selinux
services: Add support for Credential Spec and SELinux
Upstream-commit: 1b132eb374
Component: cli
2017-04-08 01:37:17 +02:00
e5c62e50ec Merge pull request #32154 from dperny/refactor-logs
Refactor logs and support service logs with TTY 
Upstream-commit: 5cf0c294d4
Component: cli
2017-04-07 18:06:50 -04:00
02ce22cff9 services: Add support for Credential Spec and SELinux
- Defined "normalized" type for Credential Spec and SELinux
- Added --credential-spec to docker service create & update
- SELinux is API only at the time

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 032d4098fb
Component: cli
2017-04-07 11:30:54 -07:00
6a97164931 Merge pull request #32289 from adshmh/add-unit-tests-for-cli-command-secret-package
add unit tests for package cli/command/secret
Upstream-commit: bac1c4a2dd
Component: cli
2017-04-07 15:26:40 +02:00
0af49729ec use an encrypted client certificate to connect to a docker daemon
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 1d17d42f8f
Component: cli
2017-04-07 01:50:51 -04:00
7ca54a3979 refactor logs and support service logs /w tty
Refactor container logs system to make communicating log messages
internally much simpler. Move responsibility for marshalling log
messages into the REST server. Support TTY logs. Pave the way for fixing
the ambiguous bytestream format. Pave the way for fixing details.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 938bf846e3
Component: cli
2017-04-06 17:54:11 -07:00
cb9af8f804 Add support for update order
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.

This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2805c2e929
Component: cli
2017-04-06 17:23:36 -07:00
31d840ff9e Add --cpus support for docker update
This fix tries to address the issue raised in 31032 where it was
not possible to specify `--cpus` for `docker update`.

This fix adds `--cpus` support for `docker update`. In case both
`--cpus` and `--cpu-period/--cpu-quota` have been specified,
an error will be returned.

Related docs has been updated.

Integration tests have been added.

This fix fixes 31032.

This fix is related to 27921, 27958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f21ec0b4d1
Component: cli
2017-04-06 15:40:12 -07:00
22b017b20d Upadte archive.ReplaceFileTarWrapper() to not expect a sorted archive
Improve test coverage of ReplaceFileTarWrapper()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b30ad6dc6e
Component: cli
2017-04-06 13:36:34 -04:00
832db1aaae Merge pull request #28938 from elifa/master
Grace period option to health checks.
Upstream-commit: cd315197e3
Component: cli
2017-04-06 19:23:56 +02:00
da58db9db7 Add label filter for docker system prune
This fix tries to address the issue raised in 29999 where it was not
possible to mask these items (like important non-removable stuff)
from `docker system prune`.

This fix adds `label` and `label!` field for `--filter` in `system prune`,
so that it is possible to selectively prune items like:
```
$ docker container prune --filter label=foo

$ docker container prune --filter label!=bar
```

Additional unit tests and integration tests have been added.

This fix fixes 29999.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 41471dfe1c
Component: cli
2017-04-06 09:11:25 -07:00
c2301d4a13 Merge pull request #32364 from aaronlehmann/preserve-env-order
cli: Preserve order of environment variables
Upstream-commit: fbddea6cac
Component: cli
2017-04-06 14:25:29 +02:00
1a49893201 Added start period option to health check.
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
Upstream-commit: a58f798fdf
Component: cli
2017-04-06 12:35:34 +02:00
a78cb013ca Factor out adding dockerfile from stdin.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 596cd38a6e
Component: cli
2017-04-05 19:42:31 -04:00
2da2221b17 build: accept -f - to read Dockerfile from stdin
Heavily based on implementation by David Sheets

Signed-off-by: David Sheets <sheets@alum.mit.edu>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 924af54d98
Component: cli
2017-04-05 19:42:31 -04:00
5a8dfda9c4 Merge pull request #32251 from AkihiroSuda/run-mount
cli: add `--mount` to `docker run`
Upstream-commit: 738ac9e797
Component: cli
2017-04-05 22:34:47 +02:00
260f839d34 stack rm should accept multiple arguments
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 585e5a0001
Component: cli
2017-04-05 01:08:37 -04:00
32f6be8e3e cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 02b904588a
Component: cli
2017-04-05 04:52:08 +00:00
9696fa517f cli: Preserve order of environment variables
Unless we are adding or removing environment variables, their order
shouldn't be changed. This makes it look like the service's TaskSpec has
changed relative to the old version of the service, and containers need
to be redeployed.

The existing code always rebuilds the list of environment variables by
converting them to a map and back, but there's no reason to do this if
no environment variables are being added.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 71d1b0507e
Component: cli
2017-04-04 18:16:57 -07:00
5cb6ccf571 Add hidden placeholder of .Self for docker node ls --format
This commit adds a hidden placeholder of `.Self` for
`docker node ls --format` so that if the node is the same
as the current docker daemon, then a `*` is outputed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b807d24e56
Component: cli
2017-04-04 12:46:44 -07:00
b2ea4b4caf added unit tests for package cli/command/secret
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: d5dca7c687
Component: cli
2017-04-04 15:35:08 -04:00
bb53f2056e Add --format for docker node ls
This fix tries to address the comment https://github.com/docker/docker/pull/30376#discussion_r97465334
where it was not possible to specify `--format` for `docker node ls`. The `--format` flag
is a quite useful flag that could be used in many places such as completion.

This fix implements `--format` for `docker node ls` and add `nodesFormat` in config.json
so that it is possible to specify the output when `docker node ls` is invoked.

Related documentations have been updated.

A set of unit tests have been added.

This fix is related to #30376.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4fc1d6782c
Component: cli
2017-04-04 11:26:35 -07:00
c25dd274e9 Merge pull request #30813 from yongtang/30232-service-ls-ports
Add `PORTS` field for `docker service ls` (`ingress`)
Upstream-commit: 9a5513b791
Component: cli
2017-04-04 17:04:27 +02:00
d9725d161b Merge pull request #32015 from dperny/service-logs-support-task-logs
Add Support for Service Task Logs
Upstream-commit: 4284efd232
Component: cli
2017-04-04 00:15:13 -07:00
1ea7589fcb Add support for task and arbitrary combo logs
Refactored the API to more easily accept new endpoints. Added REST,
client, and CLI endpoints for getting logs from a specific task. All
that is needed after this commit to enable arbitrary service log
selectors is a REST endpoint and handler.

Task logs can be retrieved by putting in a task ID at the CLI instead of
a service ID.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: b4ca6ebb09
Component: cli
2017-04-03 18:40:54 -07:00
f9c12f483a Add PORTS field for docker service ls (ingress)
This fix is related to 30232 wherw `docker service ls`
does not show `PORTS` information like `docker service ps`.

This fix adds `PORTS` fields for services that publish
ports in ingress mode.

Additional unit tests cases have been updated.

This fix is related to 30232.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e0d4e672a1
Component: cli
2017-04-03 18:40:15 -07:00
6c6797e0f8 Merge pull request #31144 from aaronlehmann/synchronous-service-commands
Synchronous service create and service update
Upstream-commit: 1551ffaa38
Component: cli
2017-04-03 17:44:03 -07:00
ec52e4b8df Synchronous service create and service update
Change "service create" and "service update" to wait until the creation
or update finishes, when --detach=false is specified. Show progress bars
for the overall operation and for each individual task (when there are a
small enough number of tasks), unless "-q" / "--quiet" is specified.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d8ab3840e0
Component: cli
2017-04-03 09:46:01 -07:00
3e55a3b7e8 Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode
cli: Wrong error message from "node ps" outside swarm mode
Upstream-commit: d37d03c9dc
Component: cli
2017-04-03 16:15:24 +02:00
5d674e346c Merge pull request #32282 from mstanleyjones/improve-attach-desc
Clarify meaning of docker attach
Upstream-commit: a090dc9653
Component: cli
2017-04-01 20:52:26 +02:00
7ac9af3ace Merge pull request #31022 from jmzwcn/issue30994
docker version output is not consistent when there are downgrades or incompatibilities #30994
Upstream-commit: e959064068
Component: cli
2017-03-31 15:55:03 -07:00
15b935e3df Merge pull request #31800 from ripcurld0/checkpoint_ls
Use formatter in docker checkpoint ls
Upstream-commit: 4666c3e589
Component: cli
2017-03-31 15:54:22 -07:00
de8ce4417c Clarify meaning of docker attach
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 081ac522bd
Component: cli
2017-03-31 13:22:21 -07:00
0e14500771 Merge pull request #31599 from ripcurld0/diff_cmd_format
Use formatter in docker diff
Upstream-commit: e3596db1a2
Component: cli
2017-03-31 11:19:41 -07:00