Commit Graph
1215 Commits
Author SHA1 Message Date
Anusha Ragunathan 661c7e779a Merge pull request #28923 from erikh/fix-copy
Fix copy API (`docker cp`, etc) uid/gid handling
Upstream-commit: 5084e4d6b4
Component: cli
2017-04-12 08:21:17 -07:00
Anusha Ragunathan 829a4940fd Merge pull request #28923 from erikh/fix-copy
Fix copy API (`docker cp`, etc) uid/gid handling
Upstream-commit: 384e8e39e1
Component: cli
2017-04-12 08:21:17 -07:00
Erik Hollensbe 1a43543a80 daemon/archive.go: Fix copy routines to preserve UID.
This changes the long-standing bug of copy operations not preserving the
UID/GID information after the files arrive to the container.

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Upstream-commit: f77e2d15d7
Component: cli
2017-04-12 10:33:19 +00:00
Erik Hollensbe d224015064 daemon/archive.go: Fix copy routines to preserve UID.
This changes the long-standing bug of copy operations not preserving the
UID/GID information after the files arrive to the container.

Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Upstream-commit: 7a767a1a7e
Component: cli
2017-04-12 10:33:19 +00:00
Anusha Ragunathan 609a6284d4 Merge pull request #32030 from ehazlett/any-runtime
Support Swarmkit Generic Task Runtime
Upstream-commit: abaaa82400
Component: cli
2017-04-11 17:53:20 -07:00
Aaron Lehmann a95c38ad30 client: Allow hex strings as source references for ImageTag
The source of a tag operation is allowed to be a 64-character hex
string. This means it should use ParseAnyReference for validation
instead of ParseNormalizedNamed.

This fixes a regression that happened in 17.04.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d857c869d2
Component: cli
2017-04-11 13:37:04 -07:00
Vincent Demeester 5d0c168973 Merge pull request #32059 from seriousben/support-dns-stack-file
add support for dns nameservers and search domains in stack files
Upstream-commit: c3cf029a49
Component: cli
2017-04-11 21:32:52 +02:00
Evan Hazlett c367f0aed1 updates for review comments
- runtimeUrl -> type_url
- runtimes -> runtime

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 58e69bfd5a
Component: cli
2017-04-11 14:02:01 -04:00
Evan Hazlett eac52ae0bb filter services by runtime; default to container
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 06a91d315c
Component: cli
2017-04-11 14:02:01 -04:00
Sebastiaan van Stijn b18a901673 Merge pull request #32284 from aaronlehmann/fix-service-defaults
Improve default handling for "service create"
Upstream-commit: f3eacf2983
Component: cli
2017-04-11 13:06:53 +02:00
Sebastiaan van Stijn e51ef4acbb Merge pull request #32284 from aaronlehmann/fix-service-defaults
Improve default handling for "service create"
Upstream-commit: 35fc4e4ef3
Component: cli
2017-04-11 13:06:53 +02:00
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Benjamin Boudreau 2ebde31440 Adding support for dns in stack files
Signed-off-by: Benjamin Boudreau <boudreau.benjamin@gmail.com>
Upstream-commit: 2e126a52f2
Component: cli
2017-04-10 20:46:33 -04:00
Tonis Tiigi af5c8ad375 builder: add an option for specifying build target
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6dc427fb61
Component: cli
2017-04-10 16:21:43 -07:00
Tonis Tiigi 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
Sebastiaan van Stijn 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
Aaron Lehmann 90352966e3 Make the CLI show defaults from the swarmkit defaults package
If no fields related to an update config or restart policy are
specified, these structs should not be created as part of the service,
to avoid hardcoding the current defaults.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d0e8fe18fc
Component: cli
2017-04-10 13:41:18 -07:00
Aaron Lehmann 769ccf7c93 Change "service inspect" to show defaults in place of empty fields
This adds a new parameter insertDefaults to /services/{id}. When this is
set, an empty field (such as UpdateConfig) will be populated with
default values in the API response. Make "service inspect" use this, so
that empty fields do not result in missing information when inspecting a
service.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 07f55b2eb5
Component: cli
2017-04-10 13:41:16 -07:00
Aaron Lehmann 0a65a7c11d Change "service inspect" to show defaults in place of empty fields
This adds a new parameter insertDefaults to /services/{id}. When this is
set, an empty field (such as UpdateConfig) will be populated with
default values in the API response. Make "service inspect" use this, so
that empty fields do not result in missing information when inspecting a
service.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e62ea2e54d
Component: cli
2017-04-10 13:41:16 -07:00
Drew Erny 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester 64f6b40468 Merge pull request #30740 from yongtang/29999-prune-filter-label
Add `label` filter for `docker system prune`
Upstream-commit: 3ac3a56f1c
Component: cli
2017-04-10 19:38:01 +02:00
Vincent Demeester 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
Daniel Nephin 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
Manjunath A Kumatagi 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
Sebastiaan van Stijn 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
Boaz Shuster 09025a38f1 Add format to the docker system df command
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: a2273ea372
Component: cli
2017-04-10 13:04:03 +03:00
Sebastiaan van Stijn 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
Arash Deshmeh 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
Victor Vieux ebae3dacbb Merge pull request #32409 from dnephin/support-consistency-params-in-compose
Add support for volume consistency in compose format
Upstream-commit: 25484159e8
Component: cli
2017-04-07 17:26:50 -07:00
Aaron Lehmann 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
Aaron Lehmann 2db399e8c5 cli: Deploying a compose file must use TaskTemplate.Networks
This is the non-deprecated field, and the one that can be changed in a
service update.

Since old daemon versions don't allow migrating from one field to the
other, make this conditional on the API version.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: f804f893b6
Component: cli
2017-04-07 16:46:25 -07:00
Aaron Lehmann 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
Sebastiaan van Stijn 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
Brian Goff 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
Andrea Luzzardi 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
Daniel Nephin 00c772cac8 Add support for volume consistency in compose format.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 545ec64de7
Component: cli
2017-04-07 13:23:33 -04:00
Vincent Demeester 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
Arash Deshmeh befd960e04 use an encrypted client certificate to connect to a docker daemon
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 3b27c0eeb2
Component: cli
2017-04-07 01:50:51 -04:00
Arash Deshmeh 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
Drew Erny 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
Aaron Lehmann 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
Yong Tang 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
Brian Goff 4c9cbc76a7 Merge pull request #32407 from dnephin/fix-rw-mode-compose-files
Support rw as a volume option in compose file
Upstream-commit: 12702bdc81
Component: cli
2017-04-06 16:24:20 -04:00
Daniel Nephin 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
Sebastiaan van Stijn 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
Yong Tang 01ff8081e4 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: c3bfcc372c
Component: cli
2017-04-06 09:11:25 -07:00