starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,353 Commits 15 Branches 323 Tags
be8ea5149d4af916cc38edd7088e6b080488da44
Commit Graph
25353 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomasz Kopczynski ec8d3f9fa9 Builder/dockerfile/dispatchers.go tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 5ece81a72aea6797809303aa3b68871f6ae01f6e
Component: engine
 2016-06-19 14:45:34 +02:00
Vincent Demeester d677409a68 Merge pull request #23720 from yongtang/23716-renaming-started-container 
Fix `docker start` error with renamed container
Upstream-commit: ce72bf80281daf0161dd5453026bf11d3703bcc6
Component: engine
 2016-06-19 13:56:13 +02:00
Vincent Demeester 4fd11124fe Merge pull request #23721 from mrjana/vendor 
Vendoring libnetwork @ab62dd6bf06bf0
Upstream-commit: f480bda09fff07bce47c3b037075a76a2226555d
Component: engine
 2016-06-19 12:09:19 +02:00
Zhang Wei 3ab13e9c6a Make --help information consistent 
Other docker command always print "[OPTIONS]" right after `docker
COMMAND`, but `build` and `push` has inconsistent help message.

This commit will fix help information format.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 0e5397633628ab154fae33152de7dc1fd4e122db
Component: engine
 2016-06-19 16:26:23 +08:00
Alexander Morozov 657edb75dc Merge pull request #23719 from shurcooL/integration-cli-fix-style-issue 
integration-cli: Change "Dns" to "DNS".
Upstream-commit: 98aa5fb2c0371452ebb12533fab36b72dec59941
Component: engine
 2016-06-18 21:33:24 -07:00
Tonis Tiigi 20fc079713 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
 2016-06-18 19:43:47 -07:00
Jana Radhakrishnan dc5d595545 Vendoring @ab62dd6bf06bf0 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 663159e9acb93ea571e8aec0a687fcc16fd96dff
Component: engine
 2016-06-18 19:19:13 -07:00
Yong Tang b8c843c318 Fix docker start error with renamed container 
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.

The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.

This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.

Additional integration tests have been added to cover this fix.

This fix fixes #23716.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6e86733b47faf0d7629751987346022544b65cb7
Component: engine
 2016-06-18 16:43:30 -07:00
Dmitri Shuralyov 31e8392bc0 integration-cli: Change "Dns" to "DNS". 
This fixes a minor lint/style issue, improves consistency.

According to Go style, which this project follows, acronyms should have
a consistent case. Source: https://github.com/golang/go/wiki/CodeReviewComments#initialisms

See https://github.com/docker/docker/pull/11310#discussion_r67394302.

Signed-off-by: Dmitri Shuralyov <shurcooL@gmail.com>
Upstream-commit: 8cf4133f3749d7fa99a56cde98676a161971fb71
Component: engine
 2016-06-18 16:32:27 -07:00
Sebastiaan van Stijn 78a01ebf61 Merge pull request #23717 from thaJeztah/carry-23482 
[carry 23482] Update inspect reference
Upstream-commit: 83f2feb72d676b40b2c8c42e08d3f4d770e5875d
Component: engine
 2016-06-18 13:52:01 -07:00
Charles Chan 69d60f8bcb Update help output to match Docker 1.11. 
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 17ae6539f6bfc20792d0a25b3f98adfce96e7337
Component: engine
 2016-06-18 13:47:12 -07:00
Sebastiaan van Stijn 815c0b5293 Merge pull request #23650 from sfsmithcha/rc1_updates 
update cli commands output for rc1, revise key concepts
Upstream-commit: 7dee5deb4d61d86613ed49b066cd84e6a470bfad
Component: engine
 2016-06-18 12:37:55 -07:00
Charles Smith e75e9b54a9 update cli commands output for rc1, revise key concepts 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 9499d5fd522e2fa31e5d0458c4eb9b420f164096
Component: engine
 2016-06-18 11:38:27 -07:00
Harald Albers e8b9b6a393 fix bash completion for docker {swarm,node} subcommands 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e65f036e134c428b1303b00a8f08b0eea79f0701
Component: engine
 2016-06-18 10:28:20 -07:00
Harald Albers 26f07d39fc correct sort order in new bash completions 
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 19753ec84dcd2961adf64c4c66b09a2f4ca3220a
Component: engine
 2016-06-18 09:54:44 -07:00
Mike Goelzer fff885e0ad Add bash completion for docker service scale 
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker
Upstream-commit: 5cf73a47f5327c38b27400012333a9e569f1a584
Component: engine
 2016-06-18 09:27:06 -07:00
Sebastiaan van Stijn f4b87ac086 Merge pull request #23713 from SvenDowideit/fix-more-links 
Fix more links
Upstream-commit: 1d45334a1ad7e28b61041d77ec7d257a3e349646
Component: engine
 2016-06-18 07:49:18 -07:00
Sven Dowideit 14409cb989 bad url 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45
Component: engine
 2016-06-18 13:00:38 +00:00
Sven Dowideit e7f24f4bb5 href links are not converted from file.md by hugo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ad1819ca1d56a0e2caae2f0f28d14a456686e00b
Component: engine
 2016-06-18 12:44:38 +00:00
Arnaud Porterie da04c716c2 Merge pull request #23703 from tiborvass/carry-23694 
Carry 23694: Default port for listen addr 
Upstream-commit: a3b6ab04f6b53454282beaee548e8f1630ccd70c
Component: engine
 2016-06-18 06:25:57 +00:00
Sebastiaan van Stijn d329d8c654 Merge pull request #23708 from vieux/lower_mode 
accept uppercase endpoint mode
Upstream-commit: 3911644782e7fdcbd8fae7a3fc86ffd4d99f191d
Component: engine
 2016-06-17 23:20:17 -07:00
Dong Chen 86bb1cfdfd Block service mode change. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 72f7cebfb036f0fc74b9fa6fcc0c154f83f1605f
Component: engine
 2016-06-17 23:04:37 -07:00
Aaron Lehmann cb1d5362ed Merge pull request #23707 from mrjana/vendor 
Vendoring swarmkit @3f135f206179e
Upstream-commit: b014d6a9174cb881dc8a7ff1ac258b343111a27e
Component: engine
 2016-06-17 22:47:58 -07:00
Aaron Lehmann beb04971ed Fix parallel push of the same image to different registries 
Layer uploads are deduplicated by a "key" made up of the layer DiffID
and the repository name. The repository name being used to form this key
was a remote version of the name that didn't include the name of the
registry. Consequently, pushes of the same layer in a repository with
the same remote name to different registries would wrongly be
deduplicated.

Correct the key by using the full name of the repository, which includes
the registry hostname as well as the image's name.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 1333ef3ca381976438d4ae10f6b0e9be21e1a9ba
Component: engine
 2016-06-17 22:27:03 -07:00
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