centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-05 10:48:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,195 Commits 56 Branches 28 Tags
dcaaa5570aaaef6a49ce5bfd60144882ad0046cd
Commit Graph

213 Commits

Author SHA1 Message Date
RangerMauve
c5d5e7341b Fix name of private key in configure-tls guide 
Fixes https://github.com/docker/docker/issues/25823

Signed-off-by: Georgiy Shibaev <RangerMauve@hotmail.com>
 2016-08-18 10:04:51 -04:00
Dong Chen
5243531291 Fix link to discovery.md. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-17 10:02:49 -07:00
Dong Chen
1c0b72c4db Revert install-w-machine.md to 833471b74c. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-08-03 17:40:32 -07:00
Sven Dowideit
9eae185fdd Merge pull request #2337 from dangoncalves/issue-2336 
Make install manual less confusing
 2016-08-03 11:38:04 -07:00
Daniel Gonçalves
535ea05d3d Make install manual less confusing 
Signed-off-by: Daniel Gonçalves <daniel.goncalves@polymont.fr>
 2016-08-03 15:43:16 +02:00
Anil Madhavapeddy
9b80918528 docs: fix extra newline in swarm label addition 
Signed-off-by: Anil Madhavapeddy <anil@docker.com>
 2016-07-14 14:36:32 +01:00
Roland Moriz
6c408c3caf fix off-by-one error in server count 
Signed-off-by: Roland Moriz <roland@moriz.de>
 2016-07-11 17:11:13 +02:00
lichao
9b156d1230 fix Switch the primary docs 
Signed-off-by: lichao <lichao@papayamobile.com>
 2016-06-28 10:43:40 +08:00
Xian Chaobo
a4f335fd40 Merge pull request #2342 from NanXiao/issue-9999 
Edit docs/discovery.md
 2016-06-26 13:20:22 +08:00
Charles Smith
68ed7f7933 remove manual note in favor of swarm-wide advisory 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-23 09:44:34 -07:00
Charles Smith
17923e3264 move Docker Swarm menu under Component Projects 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-22 21:23:49 -07:00
Sven Dowideit
2e26be8e75 The UCP wwwurl redirects to DDC page, and UCP isn't in beta anymore 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-22 11:36:46 +00:00
bin liu
06fc7e2ae7 fix typos 
Signed-off-by: bin liu <liubin0329@gmail.com>
 2016-06-22 14:29:37 +08:00
Lukáš Bacigál
1ba800ddbf Typo in scheduler/filter.md 
Correcting link to header.

Signed-off-by: Lukáš Bacigál <pixel6692@gmail.com>
 2016-06-22 00:14:08 +02:00
Charles Smith
cb7a723884 Merge pull request #2361 from sfsmithcha/engine_112_overview 
author merge: add note to Swarm docs to refer to swarm mode in Engine
 2016-06-20 16:33:52 -07:00
Charles Smith
af7d223f68 add note to Swarm docs to refer to swarm mode in Engine 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-17 16:37:16 -07:00
Daniel Basten
7df94645f0 fixed backticks typo in configure-tls.md 
Signed-off-by: Daniel Basten <daniel.basten@comlineag.de>
 2016-06-17 08:18:44 +02:00
NanXiao
04b8fa8f1d Edit docs/discovery.md 
Since only one "<node_ip>" is invisible in Markdown file, use "
node IP address" instead.

Signed-off-by: NanXiao <nan@chinadtrace.org>
 2016-06-09 13:11:32 +08:00
NanXiao
a1c58f5149 Fix typos in docs/reference/manage.md and docs/reference/join.md 
Signed-off-by: NanXiao <nan@chinadtrace.org>
 2016-06-08 17:02:07 +08:00
tommyoshaw
0ef545fde6 Typo in install manual 
Signed-off-by: tommyoshaw <thomas.shaw78@gmail.com>
 2016-06-04 18:54:59 +01:00
Sven Dowideit
883ae9240b hugo aliases need to be absolute 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-03 20:00:13 +00:00
allencloud
f62cd8c9aa fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-02 17:00:22 +08:00
Charles Smith
e69bb29b78 Merge pull request #2292 from SvenDowideit/fix-link 
fix link
 2016-05-31 15:52:08 -07:00
Sven Dowideit
9044c5177c fix link 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-31 21:25:09 +00:00
Dragos Badea
4b1e08fd9d typo: 'loadblancer' in Swarm at scale docs 
Signed-off-by: Dragos Badea <bedeabza@gmail.com>
 2016-05-31 16:55:52 +03:00
Sven Dowideit
783079aa12 Small spelling fix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-13 04:59:08 +00:00
Kirill Kolyshkin
97c534cae8 install-manual: fix sec. swarm manager connect 
Apparently, without -p 4000:4000 the secondary swarm manager would be inaccessible, basically rendering it useless.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2016-05-11 14:10:09 -07:00
realityone
fb28924a69 fix set reschedule policy docs 
Signed-off-by: realityone <realityone@me.com>
 2016-05-10 13:15:36 +08:00
Joel Handwell
3d24e74e4c Krane project has been closed in favor of Machine 
Reference: https://github.com/krane-io/krane
Signed-off-by: Joel Handwell <joelhandwell@gmail.com>
 2016-05-06 10:00:45 -04:00
Dongluo Chen
5925814d84 Merge pull request #2180 from ogryzek/typo-edits 
Edit typos in 'Try Swarm at scale'
 2016-05-04 22:33:31 -07:00
Charles Smith
7ab56957a6 Merge pull request #1978 from troyfontaine/discovery_node_docs 
Added node discovery warning
 2016-05-04 19:12:37 -07:00
Dong Chen
c4007e9507 Carry over pr/2137 with minor updates. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-05-03 14:29:38 -07:00
michael.freund
0ccc958b50 Filter for containerslots-label 
Signed-off-by: michael.freund <michael.freund@shopgate.com>
 2016-05-03 09:54:51 -07:00
Charles Smith
e8cb44fe81 Merge pull request #2072 from allencloud/update-docs-about-kernel-version 
update docs about kernel version support in production
 2016-05-02 20:50:26 -07:00
Sebastiaan van Stijn
31fe6179ab Merge pull request #2185 from SvenDowideit/use-docs-base-oss 
convert docs Dockerfiles to use docs/base:oss
 2016-04-30 01:05:26 +02:00
drew ogryzek
d2c9f8bc9a Update Edits 
Signed-off-by: drew ogryzek <drew@drewbro.com>
 2016-04-28 16:23:39 -07:00
drew ogryzek
354a71b4cf Edit typos in 'Try Swarm at scale' 
Signed-off-by: drew ogryzek <drew@drewbro.com>
 2016-04-28 16:23:39 -07:00
Sven Dowideit
77e88346c5 convert docs Dockerfiles to use docs/base:oss 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-04-28 12:57:35 +00:00
Sun Hongliang
61e0ccd243 add documentation describing the difference in api response status code. 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-26 01:21:23 +08:00
Doron Podoleanu
7e119761d4 Fix docs 
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com>
 2016-04-19 16:11:57 +03:00
Kai Qiang Wu(Kennan)
7f5972124b Fix some typo 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-15 00:45:21 +00:00
Mary Anthony
70a180cb30 Redoing the example for local machines 
Updating images
Adding in the Compose solution
Copy edits
Updating with Dong's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-04-13 09:45:04 -07:00
Ken Cochrane
ce1dffa58a Fixed more typos in the docs 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-04-13 09:44:32 -04:00
Ken Cochrane
08cacffd97 Fixed a couple typos in the docs 
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2016-04-12 17:26:30 -04:00
Sun Hongliang
b19599df53 update docs about overlay network in kernel version support 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-08 10:42:37 +08:00
moxiegirl
ba9b348bda Merge pull request #2046 from allencloud/fix-typos-in-docs 
fix typos in docs
 2016-04-06 09:17:02 -07:00
Kai Qiang Wu(Kennan)
2a778b3600 Fix old NODE column 
Some fixes was missed in last PR.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-06 01:39:39 +00:00
Kai Qiang Wu(Kennan)
8afd32a631 Fix doc for NODE column 
Swarm docker ps output nolonger have NODE column, So this updates the doc

Fixes: #2081
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-04-06 00:41:55 +00:00
Sun Hongliang
bb4a26f238 fix typos in docs 
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
 2016-04-04 14:27:14 +08:00
CodeJuan
ae46892a29 typo, the port of consul is 8500 
Signed-off-by: codejuan <xh@decbug.com>
 2016-03-28 12:53:05 +08:00