starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-26 01:10:35 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,228 Commits 15 Branches 323 Tags
82ca53bf588f2bc94d628671ff477f8129673d71
Commit Graph
25228 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn 1585ae60bd Merge pull request #23671 from tombee/task-creation-log-debug 
Change log.printf service creation msg to debug
Upstream-commit: 95074b57c6958cf89e870ddcacbe4ee80ef8b8ad
Component: engine
 2016-06-17 20:23:33 -07:00
Tõnis Tiigi 3baf108ef8 Merge pull request #23701 from icecrime/fix_update 
Change `docker service update` semantics
Upstream-commit: 5e3d9d38b42d8141d305a373819bfa19c694eef9
Component: engine
 2016-06-17 19:51:15 -07:00
Daniel Nephin 480d3f4e51 Add tests for AutoAcceptOption 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c544649874bfecf2e6b8a00a0b25db309d81cf94
Component: engine
 2016-06-17 19:43:38 -07:00
Daniel Nephin 5fe17becef Support a listen addr without a port, and add tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 595e79b805fd6e96d2e6c8876f7c9734164f5db7
Component: engine
 2016-06-17 19:43:38 -07:00
Victor Vieux 015b610f8c accept uppercase endpoint mode 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8a0c5f157892efdfd5119410adedf0f04c9c16cf
Component: engine
 2016-06-17 19:06:12 -07:00
Jana Radhakrishnan 467352d977 Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
 2016-06-17 19:01:18 -07:00
Sebastiaan van Stijn e21a14517a Merge pull request #23665 from albers/fix-completion-service 
fix bash completion for `docker service` subcommands
Upstream-commit: 2989e7b2a0f55b4c8ec4c21118a172295f1b03b7
Component: engine
 2016-06-17 17:54:49 -07:00
Sebastiaan van Stijn e1ff0ef962 Merge pull request #23702 from thaJeztah/docker-service-cli-docs 
Add initial "service" docs
Upstream-commit: 81478df9b20454624f46ebba9442019628946df0
Component: engine
 2016-06-17 17:53:46 -07:00
Sebastiaan van Stijn 6200f441cd Add initial "service" docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f565bc7ec964537a4e20bf5d4e497d15c0c9b5bf
Component: engine
 2016-06-17 17:28:24 -07:00
Arnaud Porterie (icecrime) 89ce4731a6 Change docker service update semantics 
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 1f8ab93b4422a88ef3053105c17acf1933576fbe
Component: engine
 2016-06-17 17:09:40 -07:00
Charles Smith e82e1cb033 update docker swarm cli 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 78ebfaff1a426425573c440c24eb0f36ffed4d8c
Component: engine
 2016-06-17 15:40:43 -07:00
Sven Dowideit 531b88d2e3 Merge pull request #23658 from londoncalling/mac-win-install-updates 
install mac and win pared down, link to d4mac, d4win, getting started…
Upstream-commit: 2b865dbc3a94675478a9d6faae480ff447cc75de
Component: engine
 2016-06-18 07:49:04 +10:00
Victoria Bialas 9b853ff739 install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's 
fixing links to d4mac and d4win

updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.

updates per Sven's comments in the PR

removed duplicate line in tutorials menu.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
 2016-06-17 14:46:35 -07:00
Tomasz Kopczynski 65c6cdf69c Migrate info command to cobra 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: ac7a663c0b0ae147f42048dbc19e933635e22f75
Component: engine
 2016-06-17 22:11:33 +02:00
Arnaud Porterie a8956dca4d Merge pull request #23692 from icecrime/tweak_pretty_service 
Improve `docker service inspect --pretty`
Upstream-commit: 28768a6296a4ba370dbec8751179ab0bc88ad661
Component: engine
 2016-06-17 20:08:08 +00:00
Tibor Vass 81bc9e5cf8 Merge pull request #23681 from tiborvass/plugins-fixes 
Plugins fixes
Upstream-commit: 061bbaf7a4b363ffa9b2b04b8277761f28a4a289
Component: engine
 2016-06-17 12:58:36 -07:00
Tibor Vass ebcef72412 Merge pull request #23687 from mrjana/vendor 
Vendoring libnetwork @13be89d1cf79
Upstream-commit: bd8664499528a0a446c097da80938139104a933d
Component: engine
 2016-06-17 12:05:56 -07:00
Tibor Vass 4552e85448 plugins: fix name handling for legacy plugins 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8ba17b4823f9a1a40a405905613667d97bb24546
Component: engine
 2016-06-17 12:02:05 -07:00
Arnaud Porterie (icecrime) 4c5a5698fd Improve docker service inspect --pretty 
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3c60b7b9843276082c0ba4b868f354b9b44e9627
Component: engine
 2016-06-17 11:38:19 -07:00
Alexander Morozov 7c70b5ec64 Merge pull request #23550 from swernli/execTTYFix 
Fixing bug in AttachStreams that would fail to close StdIn
Upstream-commit: c1dd933c029d425ad8f5c3787d9b591ca216e08f
Component: engine
 2016-06-17 11:19:28 -07:00
Tibor Vass 516f943b0e Merge pull request #23688 from tonistiigi/nl 
Add newline to promote/demote message
Upstream-commit: 82c9410c41c7e34939d17fa5edcba2d1d0e4d686
Component: engine
 2016-06-17 11:04:25 -07:00
Tonis Tiigi 5687ad8aed Add newline to promote/demote message 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3386e3570a1251bbea5302d8b8e639aaf68436c3
Component: engine
 2016-06-17 10:58:11 -07:00
Tibor Vass f8e31ac03e Merge pull request #23682 from mrjana/bug 
Check if DriverState is valid before using in convert
Upstream-commit: 83e31c876516313d48e50311cc59f0675087eabb
Component: engine
 2016-06-17 10:56:40 -07:00
Tibor Vass 82e43b2685 Merge pull request #23676 from avsm/swarm-cli-consistency 
`docker swarm`: more consistent CLI help
Upstream-commit: 2bd34b858d7cc374169433eb0538a4dbe48cff3f
Component: engine
 2016-06-17 10:55:15 -07:00
Antonio Murdaca 095a6d0749 Merge pull request #23664 from leonhartX/i23017 
fix #23017, add zsh completion for dockerd
Upstream-commit: e72b7ee425d9be8c1ac64580596db69912025513
Component: engine
 2016-06-17 19:44:43 +02:00
Jana Radhakrishnan 101ca2b440 Vendoring libnetwork @13be89d1cf79 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
 2016-06-17 10:27:34 -07:00
Vincent Demeester 089ba4264f Update plugin command with defaulttag 
This way, you don't have to specify the ":latest" tag for some command
and not for others

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cb321e82db662f5190a6d83a90677a9dd9fdcd31
Component: engine
 2016-06-17 10:18:18 -07:00
Derek McGowan 273dfbc1e3 Add tests for rmi 
Add integration test for removing by image id with tag and digest reference to the same repository.
Add integration test to ensure only tag to other repository remains after deleting tag with accompanying digest reference.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5cff374b140b4a836b7082d009bcfe9a6e96f1af
Component: engine
 2016-06-17 10:15:56 -07:00
Derek McGowan a4ed5a6eee Update rmi logic for canonical references 
Updates the rmi code to treat canonical references as related to tagged references from the same repository during deletion.
Canonical references with a different repository name will be treated as separate references.
Updates the remove by ID logic to still remove an image if there is a single tag reference and only canonical references to the same repository remaining.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a281be1c11d61deed7cb2853125e6d489f16aa2e
Component: engine
 2016-06-17 10:15:56 -07:00
Tibor Vass eeb8ef5ac1 plugins: fix usage for plugin commands 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 65ed9daf70ccf0027f4eac8049667130deb249ed
Component: engine
 2016-06-17 10:03:30 -07:00
Tibor Vass bc663a35ec plugins: remove automatic mounting of a state dir 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 15ff9de65801178a522c445ff9fb8964e21d12a0
Component: engine
 2016-06-17 10:03:30 -07:00
Tibor Vass dc0392a7ed plugins: install should not automatically accept all permissions 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 4b70d4561e4a9b57d80b70cfebc50831e230735a
Component: engine
 2016-06-17 10:03:30 -07:00
Tibor Vass e5e1b41404 Merge pull request #23675 from anusha-ragunathan/add_disable 
Add disable flag for plugin Install.
Upstream-commit: 906c1dc5a07827d48bede8e73e4b8673f711eea0
Component: engine
 2016-06-17 09:38:26 -07:00
Jana Radhakrishnan def8da9f42 Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
 2016-06-17 09:17:03 -07:00
Vincent Demeester 297c4a4979 Merge pull request #23663 from albers/completion-swarm-update--cert-expiry 
bash completion for `docker swarm update --cert-expiry`
Upstream-commit: 6d47b06094ffa04a6299b7c5a61beb3cbe2e655b
Component: engine
 2016-06-17 18:15:56 +02:00
Arnaud Porterie 79014c743c Merge pull request #23674 from justincormack/accepted 
Missing line feed after accepting node
Upstream-commit: 83658c5b64413ee6df4c64dcf98acbd407c6f570
Component: engine
 2016-06-17 16:08:37 +00:00
Arnaud Porterie 47cbf38661 Merge pull request #23673 from justincormack/invalud 
fix invalid typo in error message
Upstream-commit: 27e9ae3141b3f3589d6a0e1690ebb4232bf72048
Component: engine
 2016-06-17 16:08:14 +00:00
Anil Madhavapeddy 6ddced327d docker swarm: more consistent CLI help 
This changes `docker swarm help` to be consistent with capitals
and removes full stops.

Before:

```
Commands:
  init        Initialize a Swarm.
  join        Join a Swarm as a node and/or manager.
  update      update the Swarm.
  leave       Leave a Swarm.
  inspect     Inspect the Swarm
```

After:

```
Commands:
  init        Initialize a Swarm
  join        Join a Swarm as a node and/or manager
  update      Update the Swarm
  leave       Leave a Swarm
  inspect     Inspect the Swarm
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8
Component: engine
 2016-06-17 16:34:06 +01:00
Justin Cormack c99aad7fca Missing line feed after accepting node 
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: c34d752419f0e9c17aa759df1a8314974b0d17ed
Component: engine
 2016-06-17 15:49:35 +01:00
Anusha Ragunathan a9608bfa10 Add disable flag for plugin Install. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4
Component: engine
 2016-06-17 07:48:43 -07:00
Justin Cormack 71af4dcb33 fix invalid typo in error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 2322ccb8fff46a4d3a84f3ef214cb473816374af
Component: engine
 2016-06-17 15:27:54 +01:00
tomwbarlow@gmail.com b282e08783 Change log.printf service creation msg to debug 
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
Upstream-commit: eed8d14ed16846f926e2d139e8232fbc2d4641e4
Component: engine
 2016-06-17 15:03:11 +01:00
Harald Albers c653aa3775 fix bash completion for docker service subcommands 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145
Component: engine
 2016-06-17 09:49:46 +02:00
Ke Xu 3a6f26e8f3 fix #23017, add zsh completion for dockerd 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
Upstream-commit: bd1fc1e5c26b954fb35f7adda46d764d80a1a570
Component: engine
 2016-06-17 16:16:13 +09:00
Harald Albers 6b5e5294c2 bash completion for docker swarm update --cert-expiry 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: dc2fc75d4260767937d98ea81c51fdea148162b2
Component: engine
 2016-06-17 08:49:06 +02:00
Sebastiaan van Stijn f2adde44a9 Merge pull request #23656 from sfsmithcha/check_cmd_line 
update output for node commands, minor edits
Upstream-commit: 8f9c7fab24d777e5ade6ed75f01e15e4b0fde79c
Component: engine
 2016-06-16 22:54:28 -07:00
Charles Smith 913871096c update output for node commands, minor edits 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
 2016-06-16 21:44:07 -07:00
Neil Peterson 4977b39f5b Added daemon.json Windows example 
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
Upstream-commit: 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc
Component: engine
 2016-06-16 21:41:58 -07:00
Tibor Vass 800ec66e2d Merge pull request #23652 from dnephin/better-bundle-load-errors 
Improve the error messages for loading a bundle
Upstream-commit: a3795ca13ef031b6b2a17fad488c839281cd1de2
Component: engine
 2016-06-16 21:40:30 -07:00
Arnaud Porterie f381416006 Merge pull request #23647 from vieux/improve_messages_node_cmds 
improve some messages in the node subcmds
Upstream-commit: 4c5f1a7e5bfb49647eeb76d20628c7daac65ef8d
Component: engine
 2016-06-17 03:20:30 +00:00