Commit Graph

100 Commits

Author SHA1 Message Date
574f55f777 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>
Upstream-commit: 6ea36d7d48a41225c8573ef649320c1a414b8995
Component: engine
2017-03-08 21:53:24 +00:00
aad0552893 Update docker stack experimental notes
Update command usage and help.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3225150b164c97e5e67893e93f45888d552f4919
Component: engine
2017-02-07 15:17:47 +01:00
352f3bdb52 Merge pull request #29740 from lixiaobing10051267/masterGraph2
update URL of plugins_graphdriver.md in experimental/README.md
Upstream-commit: d2b27c10a1eef7c74e3c470844c3670a2ddda1c2
Component: engine
2016-12-29 11:34:19 +01:00
5f3aaff6a0 update URL of plugins_graphdriver.md in experimental/README.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 82eeab62df6e2d62dde4e5f5daefeb4bd2063527
Component: engine
2016-12-29 10:24:06 +08:00
4d710d2209 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>
Upstream-commit: f1a19fa8c08a9b68d3a7014f9800cadf40fc150f
Component: engine
2016-12-28 09:43:27 +08:00
38849b2667 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>
Upstream-commit: 677fa03654886ee776ff478c30681d5376cfc196
Component: engine
2016-12-22 15:30:25 -05:00
1173e9c692 Merge pull request #29637 from wxb0521/bo-docker-0.5
some punctuation errors and a verb form error
Upstream-commit: 584485abca124d45e08b618e23b7cbf7b947895f
Component: engine
2016-12-21 12:18:04 -05:00
44fa4f8ae7 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>
Upstream-commit: ea2dd4b5d0b41552d047814d9e39ddaa3662ab41
Component: engine
2016-12-21 20:16:19 +08:00
b238e8e00f some punctuation errors and a verb form error
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
Upstream-commit: 32996d6016a9f109a44301279d52d881651790e9
Component: engine
2016-12-21 20:05:19 +08:00
242631630a update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: eb11a10ddf5169c8c761005ebd921505fdb309a4
Component: engine
2016-12-16 04:03:02 +00:00
bb7b3b27e9 Give the correct location for plugin documentation
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 4b9604381a2101c085119f16140544fc413c2958
Component: engine
2016-11-30 09:52:28 +08:00
afebcb8b49 Modify serial number and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9ddd1242dbaeaa990c060b7b88ed859fa3b2d981
Component: engine
2016-11-15 17:15:26 +08:00
395c5f43b8 Fix the link for plugin documentation
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 701021ebd8f7bba22347be71f58563506fcc7b74
Component: engine
2016-11-09 13:50:14 +08:00
5433abf008 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls
support show numbers of global service in service ls command
Upstream-commit: a70b1d74a040e2c17bba1fe553ccbd293a64703a
Component: engine
2016-11-08 18:43:53 +01:00
f95b21c73c Update for docker checkpoint
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 90ce77e46a7d84ff801624e105b6c00749d3286c
Component: engine
2016-11-08 16:56:29 +08:00
2b57d0c977 support show numbers of global service in service ls command
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ea03f090b8e0d5530c50857f54d8e961f9139b92
Component: engine
2016-11-08 16:17:15 +08:00
7fc866cf3e Update readme link to binary installation instructions
Signed-off-by: Laura Frank <ljfrank@gmail.com>
Upstream-commit: 65e110378906bb7a7594484a764a795b2b45f0eb
Component: engine
2016-10-05 11:13:08 +02:00
0b8cdf7c7b Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
move macvlan out of experimental docs
Upstream-commit: 64fca3486082cfd59aac32d2cfd9e07b6f62a112
Component: engine
2016-09-27 18:45:00 +02:00
f2233e9c75 Merge pull request #23886 from AkihiroSuda/stackcli
add `docker stack ls`
Upstream-commit: a4dd51a6601f7cb07b23a55134dc18a12d2814ee
Component: engine
2016-09-26 21:19:04 +02:00
f557e61a5e change-code-and-fix-docs-about-checkpoint
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9b4ba34d046fc9fd65fc060af016d2b2b9b95957
Component: engine
2016-09-23 19:37:43 +08:00
0d2c33693e add docker stack ls
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5ce08ddfcae5ded73ef0c93c9daba7c916c21ae5
Component: engine
2016-09-22 19:31:39 +00:00
0ac3b2e9e4 add current limitation to experimental/checkpoint-restore.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d1c910af383fcce51e57c23b0c848c1f3c3baa8f
Component: engine
2016-09-13 05:14:41 +00:00
7bef93723c Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
2016-09-08 21:31:52 -04:00
c6f2532e79 usage description of docker deploy in md not consistant with go file
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 3298bfcb56c17cd2a0e123cb10074bcc73e1bba9
Component: engine
2016-08-30 11:40:51 +08:00
097375ead1 move mcvlan out of experimental docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6e4ec046f4a267083b1bd07028d1b68eb248a950
Component: engine
2016-08-27 19:18:12 +08:00
2f71a9ce8e 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>
Upstream-commit: e68a4b18e9808c8fcd56c8f779e7bf97e07ddfe6
Component: engine
2016-07-25 12:37:56 -07:00
1c3431e16a fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4e959ef2f7f063803d04e06166f459257eb94b5c
Component: engine
2016-07-23 11:32:23 +08:00
1ec535a2d9 Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8426f72107f351b769babadeabbf13f205126514
Component: engine
2016-07-22 10:38:56 +02:00
2332ccb8c3 Send registry auth token for service deploy
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: a26bdd8607c62e6e736d06e9ec8f0908c4808d74
Component: engine
2016-07-20 16:07:07 -07:00
9e5ae213df Merge pull request #24266 from allencloud/add_cmd_docker_stack_services_STACKNAME
add command `docker stack services STACKNAME`
Upstream-commit: 2a78789ad1e5a980a6822d90d7a5039ac7af1252
Component: engine
2016-07-20 18:38:08 +02:00
76dae42c92 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>
Upstream-commit: 06f35262c47629fef78e36daaa2742c2c0d7c3a9
Component: engine
2016-07-20 16:03:27 +02:00
34b01d4562 add command docker stack services STACKNAME
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4b21b411ecf4b43b16bdd7f4b78df8a362503724
Component: engine
2016-07-19 14:21:58 +08:00
cd03aec1cb better command docker network create -h output
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
2016-07-16 15:32:17 +08:00
5ea7133a76 Fix typo - stacks being managed, not tasks?
Upstream-commit: 88da491cd9e2c2ea15df15654ac4d98f425d54ed
Component: engine
2016-07-04 11:13:57 -04:00
0bdbf282f3 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
2191f675ed Fix docker stack link
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 93ed4b35fa6b35a24a79e3e4f9cfaea29982e7a4
Component: engine
2016-06-30 17:22:42 +08:00
2e7a10e1df Update experimental docs dsb -> dab
Fixing bundle extension in experimental documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8af760c9100d87ad89972c05312471b00f7f5691
Component: engine
2016-06-25 19:08:03 +02: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
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
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
93b2574efc Change SCALE to REPLICAS.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
c845c179d8 Merge pull request #23557 from AkihiroSuda/fix-exp-doc
Update experimental/README.md
Upstream-commit: b6a8a3da10698a43043b752552228eed71955994
Component: engine
2016-06-15 13:34:25 +02:00
b13c0385b8 Update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: fec98ecca1d82ec1f2e0bd4d5e2c180ef834dc52
Component: engine
2016-06-15 19:14:51 +09:00
76d4651592 Add experimental documentation for stacks
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: ae816baa3c36aaec5e3b7c31425b620b4709ab50
Component: engine
2016-06-14 15:31:45 -07:00
a4980222b8 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>
Upstream-commit: 44fe649c2ed6c1c6ba201086c1f83ec993ce9064
Component: engine
2016-04-13 10:11:39 -07:00
ca7bd33e58 Added 2nd experimental feature currently active
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 65ab7fa2b3316bfe38b7f57fe2d5a9c6593ed075
Component: engine
2016-03-26 07:35:03 +01:00
9d333e528b 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>
Upstream-commit: 8926af95e4af4c3f8c6e28d1d054b9b6b7a13ff9
Component: engine
2016-03-18 18:46:46 -04:00
8298077028 Update the document error
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: edf0da968ca8d653a6e4c9333e55530305cb3625
Component: engine
2016-03-18 15:23:27 +08:00
5963d3bf40 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>
Upstream-commit: f6bd62a8d735d4748dc4e5e4235e04284a7f5af6
Component: engine
2016-03-14 06:34:08 +00:00
32fe9a153d docs for experimental vlan net drivers
Signed-off-by: Brent Salisbury <brent@docker.com>
Upstream-commit: 9cb6b51fa24b95789693fa65aa58fe3ad1f36014
Component: engine
2016-03-11 16:01:01 -08:00