starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-27 01:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
25,572 Commits 15 Branches 323 Tags
c18a0faf47d9c8376e68ff9cda7ea40cb6bde416
Commit Graph
25572 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Serhat Gülçiçek bea7ea0ca9 Fix error for env variables example in docker reference - 2 
The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.

When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2, except only for one occurrence.

Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
Upstream-commit: 7a30fa7af6f0bb3850ce6167850642420b4c0633
Component: engine
 2016-06-20 13:09:44 +02:00
Sebastiaan van Stijn 122239bbc3 remove "RC" warning from Markdown files 
A site-wide banner is going to be used, so we don't need this warning

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 37ee14a99894c78396b51b62f5e979f1d000d321
Component: engine
 2016-06-20 00:24:37 -07:00
Sven Dowideit 12bd62d621 Merge pull request #23755 from thaJeztah/fix-experimental-markdown-formatting 
Fix markdown formatting for experimental
Upstream-commit: d9b1c2452a6f60879893bdfb9401fe8c501ed2f2
Component: engine
 2016-06-20 17:23:12 +10:00
Sebastiaan van Stijn 3893a6fe28 Fix markdown formatting for experimental 
- don't indent code-blocks that use fences
- fixed some formatting
- wrapped long lines to 80-chars
- removed stray empty lines

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a92f6551c92aae23ec88880b406c8854dcfa9b4a
Component: engine
 2016-06-20 00:16:25 -07:00
Sven Dowideit ca3c6a21f1 Merge pull request #23751 from friism/move-dab-into-title-and-intro 
bring dab into title and intro
Upstream-commit: 2cb050cde3b808291fe014299b6ca32b7c6777f5
Component: engine
 2016-06-20 15:06:26 +10:00
Michael Friis 36bfde1c2a bring dab into title and intro 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 6defef56194e7fe74f6f1bbc0ccb0565bc51ffd1
Component: engine
 2016-06-19 22:04:30 -07:00
Sven Dowideit e829fbd1b7 Merge pull request #23747 from friism/expand-experimental-bundle-doc 
expand stack doc
Upstream-commit: 19d571e8ebc3921f3792aa74f5f404c1c2efd36e
Component: engine
 2016-06-20 09:57:07 +10:00
Michael Friis ea89f8e724 expand stack doc 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: cd2237c2bc6bce738a42a7eaf0ba82d57857fe2f
Component: engine
 2016-06-19 16:53:46 -07:00
Sebastiaan van Stijn 225672de47 Merge pull request #23731 from WeiZhang555/fix-help 
Make --help information consistent
Upstream-commit: 70e47c4f75589e2ca46934b0f3c07b3ad87eb92d
Component: engine
 2016-06-19 16:12:09 -07:00
Sebastiaan van Stijn d5d14116e3 Merge pull request #23741 from sfsmithcha/add_links 
add links to swarm and service commands to swarm mode overview
Upstream-commit: b644ab5a4422e35f4941775f5a7e829840299890
Component: engine
 2016-06-19 15:59:19 -07:00
Alex Coventry 3f6afb427f Clarify role of dockerhost variable 
Signed-off-by: Alex Coventry <alx@empirical.com>
Upstream-commit: 8aba9fd3ec776fa419ea504982e9bc12b6427f22
Component: engine
 2016-06-19 15:35:26 -04:00
Charles Smith 85a0643506 add links to swarm and service commands to swarm mode overview 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: c13c5601961bb5ea30e21c9c8c469dd55a2f17d0
Component: engine
 2016-06-19 11:43:49 -07:00
Vincent Demeester 359bbe8a17 Merge pull request #23723 from tonistiigi/incomplete-restore 
Don’t try to restore swarm from incomplete state
Upstream-commit: 4cc70c921fb77f3a83e03e6cc9c6a63d3858b3ac
Component: engine
 2016-06-19 19:56:39 +02:00
nick d62b2b14a2 Fix misspell typos 
Signed-off-by: nick <nicholasrusso@icloud.com>
Upstream-commit: 7135afa79b4d99ba2a214fcc1c2decf95f850c2f
Component: engine
 2016-06-19 09:53:31 -07:00
Vincent Demeester 5be32366aa Merge pull request #23736 from yongtang/06192016-reference-link 
Fix reference link error in Jenkins docs failure
Upstream-commit: f01e8556bbda3aff33d6e06a4deaa330def33c1f
Component: engine
 2016-06-19 18:24:55 +02:00
Yong Tang f1b4ff8de1 Fix reference link error in Jenkins docs failure 
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa
Component: engine
 2016-06-19 08:50:13 -07:00
Sebastiaan van Stijn 14c7358b3d Merge pull request #23734 from yongtang/06192016-reference-link-deprecated-docs 
Add release tag reference links in deprecated.md
Upstream-commit: 6cc5c8a732d27fb17778c8e7e30bec7a90e7bb0c
Component: engine
 2016-06-19 07:44:25 -07:00
Yong Tang 75748b66ab Add release tag reference links in deprecated.md 
This fix adds a couple of missed release tag reference links in deprecated.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: bc20354b095906eedd346fb45bbbf9ad5e82145d
Component: engine
 2016-06-19 06:13:57 -07:00
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