docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
29,283 Commits 12 Branches 296 Tags
64b693348ded323bde6fcc8370631e9b6281d8ea
Commit Graph

4135 Commits

Author SHA1 Message Date
Victor Vieux
afb23f3459 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect 
Update secret inspect to support IDs
Upstream-commit: 7c6f001248cb6dffbffad4470caaa96e759cfe26
Component: engine
 2016-11-22 17:39:48 -08:00
Tõnis Tiigi
167591374d Merge pull request #28683 from darrenstahlmsft/SystemDLL 
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
Upstream-commit: 5c1826ec4de381df9f739ce0de28e37d4f734d47
Component: engine
 2016-11-22 16:58:30 -08:00
Anusha Ragunathan
e746d79ff3 Merge pull request #28601 from tiborvass/plugin-misc-fixes 
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
 2016-11-22 16:12:37 -08:00
Darren Stahl
4d1ac89cc0 Swap usage of LazyDLL and LoadDLL to LazySystemDLL. 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 22c83c567f379dfd475ecd35665e1cc9e5b9c314
Component: engine
 2016-11-22 14:57:11 -08:00
Sebastiaan van Stijn
53a64e3bc4 Merge pull request #26833 from cpuguy83/use_mounts_api_for_services 
Use container Mounts API for Swarm containers.
Upstream-commit: 04155250492c3fd75d2e789b6d2355636c8cf766
Component: engine
 2016-11-22 22:48:54 +01:00
Victor Vieux
08d6a8b3d7 Merge pull request #28691 from aluzzardi/service-logs-no-follow 
[experimental] service logs: Support no-follow mode
Upstream-commit: c025d5650433de503f0b415b7b5e120cfcd35b17
Component: engine
 2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
dc5227ef8f Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
 2016-11-22 22:47:38 +01:00
Evan Hazlett
9e9aefeaf8 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>
Upstream-commit: 70d2cefd51e853ca4f3bbf8eb0386360809e026b
Component: engine
 2016-11-22 16:01:16 -05:00
Brian Goff
ffb435aca9 Merge pull request #28668 from anusha-ragunathan/fix_teardown 
Check for valid daemon in TearDownTest.
Upstream-commit: 39e2e075677969332edaea1ae2d58120f78e0a18
Component: engine
 2016-11-22 13:26:08 -05:00
Brian Goff
14f731c22d Use container Mounts API for Swarm containers. 
Instead of converting nicely typed service mounts into untyped `Binds`
when creating containers, use the new `Mounts` API which is a 1-1
mapping between service mounts and container mounts.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 821aeb6a6f72f070ae045cb7813759cbbaba7bda
Component: engine
 2016-11-22 13:23:51 -05:00
Victor Vieux
3aef405305 Merge pull request #28529 from allencloud/update-secret-create-url 
fix secret create url for consistency
Upstream-commit: 772a423e08d6da2dbfebb22382270ea9d075a9a9
Component: engine
 2016-11-22 09:55:17 -08:00
Ben Firshman
e5912f7d7e Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
 2016-11-22 12:49:38 +00:00
Andrea Luzzardi
abd795e582 service logs: Support no-follow mode 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: c2d435e4f05d262aaa3d4d5cc2fe8965377eebdf
Component: engine
 2016-11-21 18:02:13 -08:00
Tonis Tiigi
c0d4c1f04f Fix race on sending stdin close event 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4e262f63876018ca78d54a98eee3f533352b0ac9
Component: engine
 2016-11-21 17:43:01 -08:00
Tibor Vass
f20a7bc47c plugins: fix some tests 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a08ffa0e934e5f8b95855cc5bd0cc2a6b3cf4091
Component: engine
 2016-11-21 16:34:10 -08:00
Anusha Ragunathan
33bbc7177a Check for valid daemon in TearDownTest. 
SetupTest could fail creating a Daemon object (eg, out of space when
creating daemon root dir). In such a case, TearDownTest fails when
accessing the daemon object. This commit adds the required nil check.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5890091cc02ca75425c8635cbe4ec6c7ccd1663b
Component: engine
 2016-11-21 13:29:13 -08:00
Vincent Demeester
f8729bb9ff Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
Upstream-commit: 05963010ee2aa363bcbd6d925918a46dba02fd7d
Component: engine
 2016-11-21 21:40:01 +01:00
Tom Denham
855a6e5ea3 Update tests to handle bug fix from libnetwork 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
Upstream-commit: 5d983d21bf5227f32a868a0b7532ab6bfc38f28e
Component: engine
 2016-11-19 16:34:56 -08:00
Victor Vieux
c148947fe6 fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
 2016-11-18 18:32:02 -08:00
Justin Cormack
9ea16716af Merge pull request #28580 from allencloud/fix-nits-in-error-message 
fix typos
Upstream-commit: b4e69fb3aa6d0def712c5df8dfac8395f86be608
Component: engine
 2016-11-18 13:18:23 +00:00
Michael Crosby
8e7b567a6b Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: aff99136b44c0a3d9ef381afd38a5cd05328ddc6
Component: engine
 2016-11-18 00:47:43 -08:00
allencloud
5d1129c013 fix typo 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1f039a66ac55c937f5dfa281a04009626d191f83
Component: engine
 2016-11-18 15:51:36 +08:00
allencloud
b0d2847574 update secret create url for consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 86d768284303665bf137ac4766a623167a605c76
Component: engine
 2016-11-18 10:18:21 +08:00
Michael Crosby
f88393dfba Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
Upstream-commit: 4b29f404b1afe0989426d7a0cc0d2e01a7a3f2b6
Component: engine
 2016-11-17 16:29:21 -08:00
Evan Hazlett
d9512c0fad 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: bebd472e40cae91b548e983872a2665a5836ba43
Component: engine
 2016-11-17 15:49:02 -05:00
Aaron Lehmann
f2f46094c2 Merge pull request #28523 from yongtang/28519-service-inspect-pretty-crash 
Fix crash caused by `docker service inspect --pretty`
Upstream-commit: 6d0f7bb4c718cbd0ae8e80bb1e974e7632d03d75
Component: engine
 2016-11-17 10:56:57 -08:00
Alexander Morozov
d4244fefc2 Merge pull request #28415 from Microsoft/jjh/builduser 
Windows: Allow `USER` in builder
Upstream-commit: 0a5a41a438ae4fef2fc1f8f8935721f1e3f28769
Component: engine
 2016-11-17 10:32:56 -08:00
Yong Tang
a8652362f7 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: b6857e91c1625695abbf5897e13f688028880c33
Component: engine
 2016-11-16 17:26:03 -08:00
John Howard
3e22d4d10e Windows: Revert 27884 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7e03ce3f13baa61ce5547574163059b712b37025
Component: engine
 2016-11-16 13:38:45 -08:00
Yong Tang
24edf94c3b Fix error messages for --cpus from daemon 
This fix fixes error messages for `--cpus` from daemon.

When `docker run` takes `--cpus`, it will translate into NanoCPUs
and pass the value to daemon. The `NanoCPU` is not visible to the user.
The error message generated from daemon used 'NanoCPU' which may cause
some confusion to the user.

This fix fixes this issue by returning the error in CPUs instead.

This fix fixes 28456.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d22ac2f3a0de8e2ff6da8f1787e3ac3ac7438f17
Component: engine
 2016-11-15 17:16:09 -08:00
Sebastiaan van Stijn
f1966cf855 Merge pull request #26868 from Microsoft/jjh/deprecateemail 
1.14 deprecation: email from login
Upstream-commit: c716827dc8de961ad2e69b2db2cb32a3749282da
Component: engine
 2016-11-15 13:08:05 +01:00
John Howard
b8e423e3ed Windows: Allow user in builder 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3c4ab9b657018cf6fc33e70a44c790563c16043
Component: engine
 2016-11-14 14:10:47 -08:00
Shayne Wang
c22557cc46 Change reading order of tailfile 
change reading order from beginning at the end to beginning at a buffer start
added intergration tests for boundary cases
Removed whitespace
Signed-off-by: Shayne Wang <shaynexwang@gmail.com>
Upstream-commit: 63904eb6745d553573ffe8b7cef43dfc0b8a07cf
Component: engine
 2016-11-13 20:08:51 -08:00
John Howard
aa871fbd88 Planned 1.13 deprecation: email from login 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a66efbddb8eaa837cf42aae20b76c08274271dcf
Component: engine
 2016-11-11 17:32:46 -08:00
Tonis Tiigi
e5cb7de38d Skip plugin tests if not in amd64 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e23e36f25cc55fd273fa04f2dd9d3772683ee381
Component: engine
 2016-11-11 09:52:13 -08:00
Yong Tang
16cd9213ef Add information for Manager Addresses in the output of docker info 
As is specified in 28018, it would be useful to know the manager's addresses
even in a worker node. This is especially useful when there are many
worker nodes in a big cluster.

The information is available in `info.Swarm.RemoteManagers`.

This fix add the information of `Manager Addresses` to the output
of `docker info`, to explicitly show it.

A test has been added for this fix.

This fix fixes 28018.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 828bd441eb828072044175f3e6867c7218e434c5
Component: engine
 2016-11-11 07:35:32 -08:00
Evan Hazlett
d0e36ad78e Merge pull request #28266 from tonistiigi/fix-service-update-test 
Fix flaky TestServiceUpdateSecrets
Upstream-commit: 45585ab7a5097bd0b9b2db1c8a50927a62201b75
Component: engine
 2016-11-11 01:17:29 -05:00
Victor Vieux
4d7a48f6ec Merge pull request #27955 from mlaventure/runc-docker-info 
Add external binaries version to docker info
Upstream-commit: 0427afa409f1a2034537b4659bf7a3a1454fa617
Component: engine
 2016-11-10 21:27:14 -08:00
Tõnis Tiigi
e297f40024 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors 
Fix registry authorization errors
Upstream-commit: 48a0c3e831a13c48a2e64558ff38a79b22881f85
Component: engine
 2016-11-10 19:39:28 -08:00
Jana Radhakrishnan
b688822593 Add support for host port PublishMode in services 
Add api/cli support for adding host port PublishMode in services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 14ac9f60d0174256e0713701ebffaf5ca827da71
Component: engine
 2016-11-10 18:07:55 -08:00
Victor Vieux
ca36766d89 Merge pull request #27998 from dnephin/compose-on-swarm 
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
 2016-11-10 17:59:57 -08:00
Derek McGowan
3fc4b494de Update pull error handling 
Translate pull errors to provide a more consistent and user friendly
error message.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 19a93a6e3d4213c56583bb0c843cf9e33d379752
Component: engine
 2016-11-10 17:34:12 -08:00
Victor Vieux
3baa399d95 Merge pull request #28226 from vieux/exit_exp_plugin 
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
 2016-11-10 17:30:54 -08:00
Victor Vieux
3213314d62 Merge pull request #28031 from yongtang/27902-extra-hosts 
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
Upstream-commit: bed96ce922da5fa9df98b826ff0e4ad4bf375a31
Component: engine
 2016-11-10 16:55:29 -08:00
Victor Vieux
fadae43674 move plugins out of experimental 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c410222e42fb9195909390337bc129c6481e2453
Component: engine
 2016-11-10 15:51:32 -08:00
Andrea Luzzardi
0d1faa11e0 Merge pull request #28089 from aluzzardi/service-logs 
service logs
Upstream-commit: 5f9fe54b35cf64181c62a8faec8651c6a25fcc95
Component: engine
 2016-11-10 15:13:41 -08:00
Tonis Tiigi
c4c2fd866c Fix flaky TestServiceUpdateSecrets 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fc21fcc90e5e1270aeb60f8f871adfd18e618c21
Component: engine
 2016-11-10 13:59:28 -08:00
Kenfe-Mickaël Laventure
1039b39798 Merge pull request #27116 from cpuguy83/22564_fix_volume_unmount 
Fix uneccessary calls to `volume.Unmount()`
Upstream-commit: f3864bcd3406c963395f6de9cdc7172c0daa1f5d
Component: engine
 2016-11-10 13:48:44 -08:00
Andrea Luzzardi
050cbb7ecd cli: docker service logs support 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: c7995fdc7760c23cdbed0fa4ca229517c71dba82
Component: engine
 2016-11-10 13:46:02 -08:00
cyli
3c13ce07e7 Fix an issue in the swarm unlock-key rotate test where we were never updating the 
previous generation unlock key.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 81f3e699c30fe412de0fa48dfa2885181f5d5002
Component: engine
 2016-11-10 11:48:39 -08:00