Commit graph

25207 commits

Author SHA1 Message Date
Vincent Demeester
96e3f3e2d0 Merge pull request #23757 from AkihiroSuda/overlay2doc
Add overlay2 description to overlayfs-driver.md
2016-06-21 14:06:57 +02:00
Sven Dowideit
a6f7167c0a Merge pull request #23805 from albers/completion--cpu-shares--c
bash completion for `-c` alias to `--cpu-shares`
2016-06-21 21:19:06 +10:00
Sven Dowideit
5ba6b1e89c Merge pull request #23804 from albers/completion-btrfs-min_space
bash completion for `docker daemon --storage-opt btrfs.min_space`
2016-06-21 21:18:49 +10:00
Sven Dowideit
a1eb6528eb Merge pull request #23803 from albers/completion-run--storage-opt
bash completion for `docker {run,create} --storage-opt`
2016-06-21 21:18:32 +10:00
Sven Dowideit
38b07e7fa6 Merge pull request #23800 from albers/completion-events-load-save
bash completion for `load` and `save` image events
2016-06-21 21:18:16 +10:00
Sven Dowideit
d5939876be Merge pull request #23799 from albers/completion-storage-driver-overlay2
bash completion for `docker daemon --storage-driver olverlay2`
2016-06-21 21:18:01 +10:00
Sven Dowideit
a7a0269624 Merge pull request #23798 from albers/completion--link-local-ip
bash completion for `docker {run,create,network connect} --link-local…
2016-06-21 21:17:37 +10:00
Sven Dowideit
78d68d6e88 Merge pull request #23794 from sdurrheimer/zsh-completion-daemon-live-restore
Add zsh completion for 'docker daemon --live-restore'
2016-06-21 21:17:17 +10:00
Sven Dowideit
d82e82a827 Merge pull request #23657 from neilpeterson/nepeters-docs-configfile
Added daemon.json Windows example
2016-06-21 21:07:19 +10:00
Vincent Demeester
f8656a6e37 Merge pull request #23772 from mlaventure/fix-missing-runtime-on-upgrade
Fix missing container runtime on upgrade
2016-06-21 12:22:28 +02:00
Vincent Demeester
097d1a2b61 Merge pull request #23780 from shishir-a412ed/doc_update_PR19367
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
2016-06-21 12:09:47 +02:00
Vincent Demeester
f3c9ba0bb0 Merge pull request #23781 from kevinjqiu/fix-doc-typo
Fix some doc typos
2016-06-21 12:07:00 +02:00
Harald Albers
79296b2770 bash completion for -c alias to --cpu-shares
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 11:30:26 +02:00
Harald Albers
f693b99870 bash completion for docker daemon --storage-opt btrfs.min_space
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 11:11:11 +02:00
Harald Albers
7d2ffa00c0 bash completion for docker {run,create} --storage-opt
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 11:04:09 +02:00
Harald Albers
5334520bf0 bash completion for load and save image events
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 10:26:21 +02:00
Harald Albers
d96eeff194 bash completion for docker daemon --storage-driver olverlay2
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 10:19:07 +02:00
Harald Albers
98483f57ed bash completion for docker {run,create,network connect} --link-local-ip
Signed-off-by: Harald Albers <github@albersweb.de>
2016-06-21 09:43:34 +02:00
Sebastiaan van Stijn
d25cc581f7 Merge pull request #23778 from thaJeztah/sync_api-1.24-1.25
Sync API changes from 1.25 -> 1.24
2016-06-21 00:41:17 -07:00
Aaron Lehmann
2753a5e916 Merge pull request #23770 from sfsmithcha/edit_swarm_concept
clarify swarm concept
2016-06-21 00:29:49 -07:00
Kevin Jing Qiu
3b2ee9a704 Fix some doc typos and spacings
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
2016-06-20 23:54:36 -07:00
Steve Durrheimer
8036fc794a
Add zsh completion for 'docker daemon --live-restore'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-21 08:31:28 +02:00
Akihiro Suda
8625adbd67 Add overlay2 description to overlayfs-driver.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-21 06:18:56 +00:00
Shishir Mahajan
fe6416d04f PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-06-20 22:27:02 -04:00
Sebastiaan van Stijn
815b2ffb41 Merge pull request #23777 from thaJeztah/disable-api-1.25
Temporarily disable API v1.25 docs
2016-06-20 14:50:03 -07:00
Sebastiaan van Stijn
93095b1699
Sync API changes from 1.25 -> 1.24
commit 79e1d3877a
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.

This updates the 1.24 API with the same changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-20 14:07:11 -07:00
Sebastiaan van Stijn
59bdd4e569
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>
2016-06-20 13:50:00 -07:00
Kenfe-Mickael Laventure
d7ceda4e37 Fix missing container runtime on upgrade
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-20 11:21:01 -07:00
Charles Smith
e029631713 clarify swarm concept
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-06-20 11:02:56 -07:00
Alexander Morozov
1bbac428de Merge pull request #23011 from coolljt0725/fix_link
Fix link doesn't work sometimes when container start with multiple networks
2016-06-20 09:42:13 -07:00
Alexander Morozov
e7fd784868 Merge pull request #23399 from tkopczynski/23211-info-command
Migrate info command to cobra
2016-06-20 09:38:53 -07:00
Alexander Morozov
7d7d8fa752 Merge pull request #23449 from HackToday/improveunit
Improve the TestEventsContainerWithMultiNetwork UT
2016-06-20 09:38:22 -07:00
Alexander Morozov
1475557341 Merge pull request #23649 from dmcgowan/image-delete-last-repo-ref
Update rmi logic for canonical references
2016-06-20 09:35:16 -07:00
Alexander Morozov
8258b09df1 Merge pull request #23678 from dnephin/share-more-node-update-code
Some cleanup for new CLI commands
2016-06-20 09:33:33 -07:00
Daniel Nephin
cacaeab9db 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>
2016-06-20 11:05:48 -04:00
Daniel Nephin
c08a50dbd1 Use flag constants for swarm flag.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-20 11:04:37 -04:00
Daniel Nephin
9d1f3373b3 add more flag constants to service update.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-20 11:03:36 -04:00
Sebastiaan van Stijn
e070503511 Merge pull request #23737 from cpuguy83/cleanup_some_service_api_docs
Fix a bunch of issues with service API docs
2016-06-20 07:03:37 -07:00
Brian Goff
79e1d3877a Fix a bunch of issues with service API docs
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-20 06:40:31 -07:00
Vincent Demeester
bfff4cce67 Merge pull request #23696 from sfsmithcha/check_swarm_cli
update docker swarm cli
2016-06-20 15:40:06 +02:00
Vincent Demeester
2bc3efffe2 Merge pull request #23714 from albers/fix-completion-service-swarm-node
Fix bash completion for `docker {swarm,node}` subcommands
2016-06-20 15:37:08 +02:00
Sven Dowideit
14a2633f3c Merge pull request #23764 from SvenDowideit/use-rc-advisory
Use rc advisory
2016-06-20 21:56:28 +10:00
Sven Dowideit
daedbc60d6 Add the advisory=rc metadata
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-20 11:54:53 +00:00
Sebastiaan van Stijn
37ee14a998
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>
2016-06-20 00:24:37 -07:00
Sven Dowideit
d9b1c2452a Merge pull request #23755 from thaJeztah/fix-experimental-markdown-formatting
Fix markdown formatting for experimental
2016-06-20 17:23:12 +10:00
Sebastiaan van Stijn
a92f6551c9
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>
2016-06-20 00:16:25 -07:00
Sven Dowideit
2cb050cde3 Merge pull request #23751 from friism/move-dab-into-title-and-intro
bring dab into title and intro
2016-06-20 15:06:26 +10:00
Michael Friis
6defef5619 bring dab into title and intro
Signed-off-by: Michael Friis <friism@gmail.com>
2016-06-19 22:04:30 -07:00
Sven Dowideit
19d571e8eb Merge pull request #23747 from friism/expand-experimental-bundle-doc
expand stack doc
2016-06-20 09:57:07 +10:00
Michael Friis
cd2237c2bc expand stack doc
Signed-off-by: Michael Friis <friism@gmail.com>
2016-06-19 16:53:46 -07:00