Commit graph

100 commits

Author SHA1 Message Date
kevinfeyrer
6ea36d7d48 Update vlan-networks.md
Some small changes to get the examples so that they run without error for me.
Improve consistency of presentation of the examples.
Fix some typos

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>

Update vlan-networks.md

Restore "ip" accidentally removed

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>

Update vlan-networks.md

Change prompt from container "$$" to host "$"

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>

Update vlan-networks.md

Some changes suggested by cpuguy83 and thaJeztah

Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>
2017-03-08 21:53:24 +00:00
Vincent Demeester
3225150b16
Update docker stack experimental notes
Update command usage and help.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-07 15:17:47 +01:00
Sebastiaan van Stijn
d2b27c10a1 Merge pull request #29740 from lixiaobing10051267/masterGraph2
update URL of plugins_graphdriver.md in experimental/README.md
2016-12-29 11:34:19 +01:00
lixiaobing10051267
82eeab62df update URL of plugins_graphdriver.md in experimental/README.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-29 10:24:06 +08:00
zhenghenghuo
f1a19fa8c0 fix some typos
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass the test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>
2016-12-28 09:43:27 +08:00
Brian Goff
677fa03654 Moves graphdriver plugn docs out of experimental
Also updates some of the structures being sent so plugins are getting
all the new options.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-22 15:30:25 -05:00
Brian Goff
584485abca Merge pull request #29637 from wxb0521/bo-docker-0.5
some punctuation errors and a verb form error
2016-12-21 12:18:04 -05:00
Jie Luo
ea2dd4b5d0 duplicated the
Signed-off-by: Jie Luo <luo612@zju.edu.cn>

typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 20:16:19 +08:00
Xinbo Weng
32996d6016 some punctuation errors and a verb form error
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
2016-12-21 20:05:19 +08:00
Akihiro Suda
eb11a10ddf update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 04:03:02 +00:00
lixiaobing10051267
4b9604381a Give the correct location for plugin documentation
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-30 09:52:28 +08:00
yuexiao-wang
9ddd1242db Modify serial number and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-15 17:15:26 +08:00
yuexiao-wang
701021ebd8 Fix the link for plugin documentation
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-09 13:50:14 +08:00
Vincent Demeester
a70b1d74a0 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls
support show numbers of global service in service ls command
2016-11-08 18:43:53 +01:00
yuexiao-wang
90ce77e46a Update for docker checkpoint
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-08 16:56:29 +08:00
allencloud
ea03f090b8 support show numbers of global service in service ls command
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-08 16:17:15 +08:00
Laura Frank
65e1103789 Update readme link to binary installation instructions
Signed-off-by: Laura Frank <ljfrank@gmail.com>
2016-10-05 11:13:08 +02:00
Vincent Demeester
64fca34860 Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
move macvlan out of experimental docs
2016-09-27 18:45:00 +02:00
Sebastiaan van Stijn
a4dd51a660 Merge pull request #23886 from AkihiroSuda/stackcli
add `docker stack ls`
2016-09-26 21:19:04 +02:00
allencloud
9b4ba34d04 change-code-and-fix-docs-about-checkpoint
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-23 19:37:43 +08:00
Akihiro Suda
5ce08ddfca add docker stack ls
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-22 19:31:39 +00:00
Akihiro Suda
d1c910af38 add current limitation to experimental/checkpoint-restore.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-13 05:14:41 +00:00
boucher
d8fef66b03 Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:52 -04:00
lixiaobing10051267
3298bfcb56 usage description of docker deploy in md not consistant with go file
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-30 11:40:51 +08:00
allencloud
6e4ec046f4 move mcvlan out of experimental docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-27 19:18:12 +08:00
Yong Tang
e68a4b18e9 Add a bundlefile example in the documentation
There is no example bundlefile in the documentation
so a bundlefile example has been added. This should
help in case user don't want to search inside the
source code.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-25 12:37:56 -07:00
allencloud
4e959ef2f7 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-23 11:32:23 +08:00
Vincent Demeester
8426f72107
Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
Nishant Totla
a26bdd8607
Send registry auth token for service deploy
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-07-20 16:07:07 -07:00
Sebastiaan van Stijn
2a78789ad1 Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME
add command `docker stack services STACKNAME`
2016-07-20 18:38:08 +02:00
Sebastiaan van Stijn
06f35262c4
Rename --bundle to --file
This renames the '--bundle' flag for docker (stack) deploy
to be consistent with 'docker build'.

Note that there's no shorthand '-f' added for now,
because this may be confusing on 'docker stack config',
which also takes a file, and for which we may want to
have a '--format' flag in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 16:03:27 +02:00
allencloud
4b21b411ec add command docker stack services STACKNAME
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-19 14:21:58 +08:00
allencloud
d0081a0f47 better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-16 15:32:17 +08:00
skaasten
88da491cd9 Fix typo - stacks being managed, not tasks? 2016-07-04 11:13:57 -04:00
Otto Kekäläinen
644a7426cc Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
2016-07-03 20:58:11 +03:00
Wen Cheng Ma
93ed4b35fa Fix docker stack link
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-06-30 17:22:42 +08:00
Vincent Demeester
8af760c910
Update experimental docs dsb -> dab
Fixing bundle extension in experimental documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-25 19:08:03 +02: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
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
Michael Friis
cd2237c2bc expand stack doc
Signed-off-by: Michael Friis <friism@gmail.com>
2016-06-19 16:53:46 -07:00
Daniel Nephin
4df0349948 Change SCALE to REPLICAS.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-15 17:57:59 -04:00
Vincent Demeester
b6a8a3da10 Merge pull request #23557 from AkihiroSuda/fix-exp-doc
Update experimental/README.md
2016-06-15 13:34:25 +02:00
Akihiro Suda
fec98ecca1 Update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-06-15 19:14:51 +09:00
Arnaud Porterie (icecrime)
ae816baa3c
Add experimental documentation for stacks
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-14 15:31:45 -07:00
Thomas Gazagnaire
44fe649c2e Graphdriver docs (#22003)
* Fix closing strings in graphdriver plugin documentation

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Fix documenation for Err type in graphdriver plugins

Fix https://github.com/docker/go-plugins-helpers/issues/24

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Add missing MountLabel argument in graphdriver plugin documentation

The real `Create` seems also to take more arguments (the `storageOpt`) which
are not exposed to the plugin API (yet?).

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Add missing CreateReadWrite in graphdriver plugin documentation

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2016-04-13 10:11:39 -07:00
Robin Naundorf
65ab7fa2b3 Added 2nd experimental feature currently active
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
2016-03-26 07:35:03 +01:00
Brent Salisbury
8926af95e4 Updates to macvlan/ipvlan experimental docs
- Added a few more diagrams.
- Fixed typos and a few additional  details.
- Moved experimental images to a new directory
  in /experimental/images per @cpuguy83 suggestion.

Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-18 18:46:46 -04:00
Wen Cheng Ma
edf0da968c Update the document error
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-03-18 15:23:27 +08:00
Kai Qiang Wu(Kennan)
f6bd62a8d7 Fix the typo url and info
Some info is not consistent between context and word.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-03-14 06:34:08 +00:00
Brent Salisbury
9cb6b51fa2 docs for experimental vlan net drivers
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-11 16:01:01 -08:00