docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
28,660 Commits 12 Branches 297 Tags
b343bd70e16f33e38f5d3df9952881030ee0ffca
Commit Graph

26920 Commits

Author SHA1 Message Date
Steve Durrheimer
b343bd70e1 Move zsh completion logic to new subcommand: rm 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e5c98f3887b1b6e2a0deb11bc5d371d5300ca2aa
Component: engine
 2016-11-09 08:15:20 +01:00
Steve Durrheimer
733d81aad9 Move zsh completion logic to new subcommand: push 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 17cdc95a199aa8543aaa90359aa461ad5bf4240d
Component: engine
 2016-11-09 08:15:18 +01:00
Steve Durrheimer
1edb788a77 Move zsh completion logic to new subcommand: pull 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 102742a3cdc3633c8adb28f4f6cccd5028b46039
Component: engine
 2016-11-09 08:15:16 +01:00
Steve Durrheimer
5f05123095 Move zsh completion logic to new subcommand: ls 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c333821334db2c8c1d8e4af73176ec8cdefe4643
Component: engine
 2016-11-09 08:15:14 +01:00
Steve Durrheimer
58ef25601e Move zsh completion logic to new subcommand: load 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c308befdc0f8afa21c0ee7048cec1e5eca9c8da0
Component: engine
 2016-11-09 08:15:13 +01:00
Steve Durrheimer
572723e3ba Add zsh completion logic to new subcommand: inspect 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d0014299b420191ceef627ed8dda809914b9ff4c
Component: engine
 2016-11-09 08:15:11 +01:00
Steve Durrheimer
d6334ea62f Move zsh completion logic to new subcommand: import 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a4656e46f77c11aa27fa8e1f37398ea9b8c4738c
Component: engine
 2016-11-09 08:15:10 +01:00
Steve Durrheimer
0144aba2f6 Move zsh completion logic to new subcommand: history 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2014e787309d3eb1fcf26ffd324deef2c2177d7a
Component: engine
 2016-11-09 08:15:08 +01:00
Steve Durrheimer
34207fe9ff Move zsh completion logic to new subcommand: build 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d3305a17e11233451ed79cb6f2f0f6c8a9b03b94
Component: engine
 2016-11-09 08:15:07 +01:00
Steve Durrheimer
4e97cf792b Add zsh completion for 'docker image' subcommands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 53a56990c43985f1bacc0c87d92e7cb7743475ae
Component: engine
 2016-11-09 08:15:05 +01:00
Steve Durrheimer
d0a8f76683 Rename zsh images & log complete functions 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2a44da973200258cf80fb9693a4e84211ee3a3d9
Component: engine
 2016-11-09 08:14:40 +01:00
John Howard
5689e4e9c3 Merge pull request #28185 from Microsoft/jjh/concurrentaccess 
Windows: Avoid concurrent access to sysinfo
Upstream-commit: 64a42d656b14a754192c8e682047ca36d92666bc
Component: engine
 2016-11-08 19:22:09 -08:00
Victor Vieux
0fd78d838a Merge pull request #27745 from vieux/cli_backward_compose_api 
allow client to talk to an older server
Upstream-commit: d3c780bb90cb5a087fdbffbb8be14fa5eaacca10
Component: engine
 2016-11-08 18:27:23 -08:00
John Howard
389ad4c08e Windows: Avoid concurrent access to sysinfo 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 54e09aa4e26c60deb74f994a08e96abea8fb857e
Component: engine
 2016-11-08 17:52:38 -08:00
Victor Vieux
fc16f27149 Merge pull request #28088 from aluzzardi/service-ps-task-resolution 
service ps: Truncate Task IDs
Upstream-commit: 383a2f046b16c9f79d2fb800844e6550cc784871
Component: engine
 2016-11-08 17:44:15 -08:00
Victor Vieux
cc2d08fb86 Merge pull request #27567 from yongtang/24391-dns-setting 
Add custom DNS settings to service definition
Upstream-commit: 462e57f05eba94cacad2c5e1383d94baf8fe090b
Component: engine
 2016-11-08 17:43:00 -08:00
Victor Vieux
0d0bda3a4b Merge pull request #28171 from tonistiigi/fix-fifo-rm-warn 
Don’t warn on missing fifo
Upstream-commit: c3c58f83b6e49e792e7bb355a0fbe5d1d308cf82
Component: engine
 2016-11-08 17:42:15 -08:00
Victor Vieux
5a46073d11 Merge pull request #28086 from vieux/delete_rootfs_plugin 
delete plugin rootfs on `docker plugin rm`
Upstream-commit: 4b63ad33ec77dbf15879da8ce8a7870d58f562bd
Component: engine
 2016-11-08 17:03:01 -08:00
Sebastiaan van Stijn
067ec4c6cd Merge pull request #27420 from Shugyousha/journaldfixes 
Small logger journald cleanup
Upstream-commit: 3975d648b70f2f18c1ba15c4b590de5c418d34db
Component: engine
 2016-11-09 01:35:08 +01:00
Andrea Luzzardi
e52aa72e3a service ps: Truncate Task IDs 
- Refactored to move resolution code into the idresolver
- Made `ps` output more bearable by shortening service IDs in task names

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: d296f7a391b54cc5a0b0a80a9d735e7e47a96c86
Component: engine
 2016-11-08 16:17:15 -08:00
Victor Vieux
df125f380f Merge pull request #27992 from Microsoft/jjh/minapitoinfo 
Adds `MinAPIVersion` to docker version
Upstream-commit: 2d4203222574623b10d94817b9959a08698f516b
Component: engine
 2016-11-08 15:49:33 -08:00
Yong Tang
647428d26f Add custom DNS settings to service update 
This fix adds `--dns-add`, `--dns-rm`, `--dns-opt-add`, `--dns-opt-rm`,
`--dns-search-add` and `--dns-search-rm` to `service update`.

An integration test and a unit test have been added to cover the changes in this fix.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a39c0cf00780c021e98f638ab7edf151a8adb789
Component: engine
 2016-11-08 15:41:32 -08:00
Yong Tang
6fb775ea79 Add custom DNS settings to service definition 
This fix tries to fix the issue raised in 24391 about allowing
custom DNS settings to service definition.

This fix adds `DNSConfig` (`Nameservers`, `Options`, `Search`) to
service definition, as well as `--dns`, `--dns-opt`, and `dns-search`
to `service create`.

An integration test has been added to cover the changes in this fix.

This fix fixes 24391.

A PR in swarmkit will be created separately.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9e8adbecf505620a1cb3a840189b59450493a00b
Component: engine
 2016-11-08 15:41:32 -08:00
Sebastiaan van Stijn
99c60f0c89 Merge pull request #28175 from Microsoft/jjh/hcsshim0.5.6 
Revendor Microsoft/HCSShim v0.5.7
Upstream-commit: 703dcbe579bb4b463ddc8758eb22c3a9ba8202a3
Component: engine
 2016-11-09 00:37:13 +01:00
Tibor Vass
08da55efb1 Merge pull request #28142 from vieux/plugin_install_args 
support settings in docker plugins install
Upstream-commit: c33fb1013d9a06c0efd5f29efa2aaa5a412476f2
Component: engine
 2016-11-08 15:05:39 -08:00
Aaron Lehmann
db11fea742 Merge pull request #27123 from tonistiigi/fix-join-reconnect 
Don’t attempt to reconnect swarm on failed join after timeout
Upstream-commit: 0ccbae04370f8c48a6ae0ff2fc4181347f89e11d
Component: engine
 2016-11-08 14:53:44 -08:00
Alexander Morozov
df37726742 Merge pull request #28167 from mlaventure/update-containerd 
Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
Upstream-commit: ff41cecc17d1396c8aec195610e2f72906160469
Component: engine
 2016-11-08 14:25:16 -08:00
Vincent Demeester
bfad529f12 Merge pull request #28170 from icecrime/poule_rebuild_all 
poule: add `rebuild/*` to rebuild all at once
Upstream-commit: 4c6db5d9cb4021dab3021008648d2d56f08792cd
Component: engine
 2016-11-08 22:37:33 +01:00
John Howard
8101ecbf52 Fix typo limitied 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 27de9f6ece0f62dbdf2a6bfa12cf3019f25e78fa
Component: engine
 2016-11-08 13:06:24 -08:00
John Howard
226e7112f7 Revendor Microsoft/HCSShim v0.5.7 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8ae916064375693862346f7fbbf3a79aff14d811
Component: engine
 2016-11-08 12:09:11 -08:00
Victor Vieux
05466ddbca Merge pull request #28147 from yongtang/27567-service-update-docs-plural-form 
Change to plural forms for help output of `docker service update`
Upstream-commit: fb9aca312802870add3a88d45d7a1c45f7fab327
Component: engine
 2016-11-08 11:14:40 -08:00
Victor Vieux
a91e44839b Merge pull request #28166 from vdemeester/dont-use-pkg-integration-in-other-pkg 
Remove use of pkg/integration in pkg/idtools
Upstream-commit: ffccf2cab95e05d5c5a883bfe3475ee65a84b16c
Component: engine
 2016-11-08 10:43:45 -08:00
Silvan Jegen
00b0b30b49 Clean up journald logger 
We clean up the journald logger with these four changes.

1. Make field array static
2. Make function name more appropriate
3. Initialize the file descriptors only once
4. Avoid copying the journald cursor

Point 4 is the most significant change: instead of treating the journald
cursor like a Go string we use it as a raw C.char pointer. That way we
avoid the copying by the C.CString and C.GoString functions.

Signed-off-by: Silvan Jegen <s.jegen@gmail.com>
Upstream-commit: d359daaa487e68d187cc30c9da8fc08a158c7f79
Component: engine
 2016-11-08 19:09:59 +01:00
Tonis Tiigi
28d4c9907d Don’t warn on missing fifo 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ee9d28bd3fa3fb98a231a76bf4908397d63fec1d
Component: engine
 2016-11-08 09:59:49 -08:00
Kenfe-Mickael Laventure
20482eac18 Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531 
This version:
 - properly follow context cancellation on Start and Exec
 - add support for Solaris
 - ensure exec exit events are always seen before init's

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 0aa17f0f6090ddeefaa6a0bc618aeb8baf3afa3f
Component: engine
 2016-11-08 09:47:41 -08:00
Vincent Demeester
5433abf008 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls 
support show numbers of global service in service ls command
Upstream-commit: a70b1d74a040e2c17bba1fe553ccbd293a64703a
Component: engine
 2016-11-08 18:43:53 +01:00
Arnaud Porterie (icecrime)
e79ab7a217 poule: add rebuild/* to rebuild all at once 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3d89d694eab1313a66958a3e4b63194935559129
Component: engine
 2016-11-08 09:42:09 -08:00
Brian Goff
4b60a6ae97 Merge pull request #28140 from tonistiigi/update-fifo 
vendor: update fifo to 14056439
Upstream-commit: 16ea0806f8c49f7126d0c244ca363d2327ba7e50
Component: engine
 2016-11-08 12:31:03 -05:00
Sebastiaan van Stijn
e5fe6e7966 Merge pull request #27466 from mrjana/net 
Retry AttachNetwork when it fails to find network
Upstream-commit: 9a61bd05f8c86be2a7f03d57f29991abaae20e5a
Component: engine
 2016-11-08 18:25:45 +01:00
Vincent Demeester
d0ecad688d Remove use of pkg/integration in pkg/idtools 
This remove a dependency on `go-check` (and more) when using
`pkg/idtools`. `pkg/integration` should never be called from any other
package then `integration`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: acf7ce1aa0bcaaf0b541b695ce5fbd22676e9239
Component: engine
 2016-11-08 17:21:02 +01:00
Justin Cormack
dc4e39cec4 Merge pull request #28130 from tophj-ibm/change-jq-syntax-for-old-version-support 
[integration-cli] changes syntax to support older version of jq
Upstream-commit: 3a5a0ef1d4df99452da3f21955030abaf29a2642
Component: engine
 2016-11-08 14:00:59 +00:00
Brian Goff
770f488176 Merge pull request #28152 from AkihiroSuda/fix-tmpfs-ro-mount 
api: fix ReadOnly support for tmpfs
Upstream-commit: 8a396f90f5ff32aee36ada3cfd0a1ed214f0e88e
Component: engine
 2016-11-08 08:59:48 -05:00
Yong Tang
533d6e45ea Change to plural forms for help output of docker service update 
This fix is based on the comment in
https://github.com/docker/docker/pull/27567#discussion_r86910604

Basically, in the help output of `docker service update`, the `--xxx-add`
flags typically have plural forms while `--xxx-rm` flags have singular
forms.

This fix updates the help output for consistency.

This fix also updates the related docs in `service_update.md`.
The help output in `service_update.md` has been quite out-of-sync
with the actual output so this fix replaces the output with the
most up-to-date output.

This fix is related to #27567.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1b42d9d0db4f1eadf0a70424ff829bb3346f7bd9
Component: engine
 2016-11-08 05:53:56 -08:00
Akihiro Suda
d78d9594ad Merge pull request #28158 from lixiaobing10051267/masterMakeSum 
fix using wrong function name for MakeTarSumContext
Upstream-commit: 189727581be77049f7f3234894c3966639808e89
Component: engine
 2016-11-08 22:37:23 +09:00
Akihiro Suda
988bfccd70 Merge pull request #28157 from yuexiao-wang/update-checkpoint 
Update for docker checkpoint
Upstream-commit: cbc511720ab13bff05a66c9fa72f5354b2c7bc94
Component: engine
 2016-11-08 22:36:22 +09:00
Victor Vieux
d0ebaa81e8 always add but hide experimental cmds and flags 
Signed-off-by: Victor Vieux <vieux@docker.com>

update cobra and use Tags

Signed-off-by: Victor Vieux <vieux@docker.com>

allow client to talk to an older server

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e98e4a71110fd33852bb755a9b8b4ebc9df904db
Component: engine
 2016-11-08 04:55:27 -08:00
Sebastiaan van Stijn
b1990eccbb Merge pull request #28143 from icecrime/poule 
Add poule.yml
Upstream-commit: 14a06cbb29b6100e5705d777ce42b3a375a54542
Component: engine
 2016-11-08 13:09:09 +01:00
Vincent Demeester
032d1bd1bd Merge pull request #28153 from YuPengZTE/devCtx 
context.Context should be the first parameter of a function
Upstream-commit: ec221643587a6c22b7e0ab20087ce97100285fb9
Component: engine
 2016-11-08 12:40:32 +01:00
Vincent Demeester
d07b461649 Merge pull request #28144 from yongtang/11072016-swarmkit-update 
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
Upstream-commit: 2fa63c90de627423be54a929cb6b023e84123b34
Component: engine
 2016-11-08 12:39:03 +01:00
Victor Vieux
2153863109 delete plugin rootfs on plugin rm 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 586b7cc19ef289b0f60a859ca75ec6a9eb97120d
Component: engine
 2016-11-08 03:30:37 -08:00