09d393de2e
bash completion for load and save image events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5334520bf04598121b026c0b5018714fd4120d44
Component: engine
2016-06-21 10:26:21 +02:00
5a4ecb85ca
Merge pull request #23770 from sfsmithcha/edit_swarm_concept
...
clarify swarm concept
Upstream-commit: 2753a5e9169074fd75ba954af2ec57f5ccb9caba
Component: engine
2016-06-21 00:29:49 -07:00
932804ba14
Merge pull request #23777 from thaJeztah/disable-api-1.25
...
Temporarily disable API v1.25 docs
Upstream-commit: 815b2ffb41e93e72ae54b799ac1059263529963b
Component: engine
2016-06-20 14:50:03 -07:00
acc2e881b3
Temporarily disable API v1.25 docs
...
The docs are currently published from "master" for the RC,
so hiding v1.25 API, which is for docker 1.13
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 59bdd4e56986c09a998f41bfec23a30df14444cc
Component: engine
2016-06-20 13:50:00 -07:00
72d1e6e5de
clarify swarm concept
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e0296317131782008dcb94c72d591244663d61b1
Component: engine
2016-06-20 11:02:56 -07:00
6a59bd46d7
Merge pull request #23011 from coolljt0725/fix_link
...
Fix link doesn't work sometimes when container start with multiple networks
Upstream-commit: 1bbac428de015a24a0724a9d0990d500c445dcad
Component: engine
2016-06-20 09:42:13 -07:00
17b17e3e6c
Merge pull request #23399 from tkopczynski/23211-info-command
...
Migrate info command to cobra
Upstream-commit: e7fd7848688719221853886e9871baa5b09953c1
Component: engine
2016-06-20 09:38:53 -07:00
3f15c5ff29
Merge pull request #23449 from HackToday/improveunit
...
Improve the TestEventsContainerWithMultiNetwork UT
Upstream-commit: 7d7d8fa752d343a084164717d7089cd47f0cacc7
Component: engine
2016-06-20 09:38:22 -07:00
f30933141d
Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref
...
Update rmi logic for canonical references
Upstream-commit: 1475557341b94ef8d8b2ced1bc4fa49b184cd5ff
Component: engine
2016-06-20 09:35:16 -07:00
24a553edc2
Merge pull request #23678 from dnephin/share-more-node-update-code
...
Some cleanup for new CLI commands
Upstream-commit: 8258b09df18506b802745ea370b52b384f51ae18
Component: engine
2016-06-20 09:33:33 -07:00
7768ca41d3
Remove dead code from node update.
...
Also share mode code between update commands
and use flag constants
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cacaeab9db51f42c33872c6cce1adc3e55f1c9c5
Component: engine
2016-06-20 11:05:48 -04:00
22e8ff931c
Use flag constants for swarm flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
2016-06-20 11:04:37 -04:00
c30cfa209c
add more flag constants to service update.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9d1f3373b3678033c1be197fafc55010cc8531dd
Component: engine
2016-06-20 11:03:36 -04:00
67d1984a09
Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
...
Fix a bunch of issues with service API docs
Upstream-commit: e070503511c5cebbb0ee0f1737dcf2f590ce6853
Component: engine
2016-06-20 07:03:37 -07:00
b9bedcbcb2
Fix a bunch of issues with service API docs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79e1d3877a1b1697028399b8ce39c4ee27b60a96
Component: engine
2016-06-20 06:40:31 -07:00
b6c8db0026
Merge pull request #23696 from sfsmithcha/check_swarm_cli
...
update docker swarm cli
Upstream-commit: bfff4cce676f12fb092e82b61cc626dfa3944405
Component: engine
2016-06-20 15:40:06 +02:00
4df9b560ec
Merge pull request #23714 from albers/fix-completion-service-swarm-node
...
Fix bash completion for `docker {swarm,node}` subcommands
Upstream-commit: 2bc3efffe29d3a87f3c1f262c39c419d70708d5d
Component: engine
2016-06-20 15:37:08 +02:00
b11273ccd9
Merge pull request #23764 from SvenDowideit/use-rc-advisory
...
Use rc advisory
Upstream-commit: 14a2633f3c8777e0b2d7deed691f122d0b5a8ffd
Component: engine
2016-06-20 21:56:28 +10:00
aeecaae19f
Add the advisory=rc metadata
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: daedbc60d61387cb284b871145b672006da1b6de
Component: engine
2016-06-20 11:54:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
4fd11124fe
Merge pull request #23721 from mrjana/vendor
...
Vendoring libnetwork @ab62dd6bf06bf0
Upstream-commit: f480bda09fff07bce47c3b037075a76a2226555d
Component: engine
2016-06-19 12:09:19 +02:00
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
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
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
dc5d595545
Vendoring @ab62dd6bf06bf0
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 663159e9acb93ea571e8aec0a687fcc16fd96dff
Component: engine
2016-06-18 19:19:13 -07:00
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
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
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
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
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
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
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
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
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
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
