Commit Graph

58 Commits

Author SHA1 Message Date
Mary Anthony
593838f73b Carries and fixes #1216
Signed-off-by: Mary Anthony <mary@docker.com>
2015-09-16 10:01:21 -07:00
Victor Vieux
c3d890a727 Merge pull request #1178 from MHBauer/hosted-network-connectivity
Add reliance on external internet connectivity
2015-09-01 16:45:23 -07:00
Morgan Bauer
f6caa46c98 Add reliance on external internet connectivity
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-01 15:00:30 -07:00
Everett Toews
6ba2d1144f Fix manager-X to match code and docs
Signed-off-by: Everett Toews <everett.toews@rackspace.com>
2015-08-31 12:02:11 -05:00
Morgan Bauer
6d8fea0664 clarify discovery service information
- specify that we need to use a discovery service
 - indicate which specific discovery service we are using for this example
 - describe the token discovery service as hosted at Docker Hub
 - link to other available discovery services in the docs

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-28 18:47:40 -07:00
Morgan Bauer
7b593c0140 changes to manual swarm install
- separate the node setup steps from the manager setup steps.
 - consistency of <manager_port> in all steps

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-27 11:22:25 -07:00
Morgan Bauer
6c2f4c20c9 update docker daemon initialization to use subcommand vs -d flag
- includes note regarding deprecation of -d flag

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-26 17:18:24 -07:00
Mary Anthony
55692c3ec0 Fixing links after check
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-11 09:56:33 -07:00
Victor Vieux
2537f4abf9 remove useless release-notes.md
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-08-10 13:32:57 -07:00
moxiegirl
2a9503e449 Merge pull request #1073 from moxiegirl/remove-boot2docker-1072
Fixes #1072 replacing boot2docker references
2015-07-27 18:39:47 -07:00
Peggy Li
0572a6778c Fix 'Scheduler' typos and update User Guide link
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-07-20 20:41:33 -07:00
Mary Anthony
d6e433da2c Updating to use the new base
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 15:42:05 -07:00
Mary Anthony
eb78d72ef0 Fixes #1072
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 16:45:57 -07:00
Victor Vieux
20c3a7810c Merge pull request #1035 from moxiegirl/fix-list
Fixes 1021 by reformatting the list
2015-07-17 11:05:42 -07:00
Mary Anthony
99fb28f7d3 Fixes 1021 by reformatting the list
Changing front to frontend per vieux
Updating to get lists looking proper

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:47:10 -07:00
Peggy Li
2628b5510a Update Github links to point to docker/swarm
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-07-16 19:03:26 -07:00
Tom Benner
08a77c19c8 Fix small typo ("an"/"ran")
Signed-off-by: Tom Benner <tombenner@gmail.com>
2015-07-11 00:09:05 -07:00
Leo Gallucci
014fa26875 Fix tiny typo "is is" with "is" in index.md
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
2015-07-10 09:59:38 +02:00
Mary Anthony
29ff252766 Troubleshooting revealed need id if title is the same
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-03 21:43:28 -07:00
Mary Anthony
45257e0548 Updating wieght
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 18:03:02 -07:00
Mary Anthony
9dfa2ab0ce fixing weight
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 17:51:22 -07:00
Mary Anthony
3f0cdc5de9 Changing title on menu
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 17:25:10 -07:00
Mary Anthony
f908f1eeb1 Switch to install
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-30 16:44:17 -07:00
moxiegirl
3f7715c030 Merge pull request #959 from ahmetalpbalkan/patch-2
Container name fix scheduler/filter/README.md
2015-06-30 08:03:32 -07:00
Mary Anthony
1ed28a1105 Fixing releasnotes
Removing older release notes. No longer supporting cumulative

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-26 03:01:40 -07:00
Mary Anthony
b2ddf537a3 Comment out the old releas notes
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-21 16:49:45 -07:00
Mary Anthony
e765a82b67 Fixing the headers
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-19 14:59:16 -07:00
Alexandre Beslic
ee95c53de6 add documentation on leader election/high availability of swarm manager instances
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-06-18 15:52:30 -07:00
Mary Anthony
686caf1185 Fixing duplicate title
Closes #948 the fix that Amy put in
Updating sed scripts
Updating after link tests

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-18 12:12:48 -07:00
Ahmet Alp Balkan
a65766e686 Container name fix scheduler/filter/README.md
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-06-15 14:16:12 -07:00
Mary Anthony
7858d301ff Updating for Hugo work
Updating title and other things
Removing old mkdocs file
Updating with the new sed scripts
Moving from index.md swarm-overview.md
Updating with the correct image

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-14 16:07:37 -07:00
Victor Vieux
1afc1be2d1 support only 1.6.0+
update test/regression/run.sh
uddate doc
update tests

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-06-12 13:27:15 -07:00
Matt Bentley
7fc0f9f2a6 Fixed image affinity examples in docs
Signed-off-by: Matt Bentley <mbentley@mbentley.net>
2015-06-08 13:11:46 -04:00
Mary Anthony
607d585adb Updating the Introduction
- Clarifying two types of install
- Splitting out release notes
- Splitting out two install methods
- Adding in comments from review
- Adding release notes
- Updating with abronan's comments
- Updating for vieux
- Updating with comments and pulling bash

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-31 20:13:24 -07:00
Alexandre Beslic
23f66f8cc6 Merge pull request #858 from aluzzardi/addr-flag
Replace --addr with --advertise
2015-05-27 11:44:41 -07:00
Alex Chan
917653254c Small spelling and capitalisation fixes
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
2015-05-27 15:22:36 +01:00
Andrea Luzzardi
7394be0704 Replace --addr with --advertise
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 17:43:14 -07:00
Andrea Luzzardi
1a58a85b44 discovery: KV Path is now an optional prefix.
"consul://addr1" will store discovery entries into "docker/swarm/nodes"
"consul://addr2/foo" will store entries in "foo/docker/swarm/nodes"

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-26 14:25:23 -07:00
Victor Vieux
10a7abd89e Merge pull request #833 from abronan/docs_changes
Add example of secured setup using docker-machine, marks the manual setup as insecure
2015-05-22 14:55:30 -07:00
Mary Anthony
8719caa890 Reconfigure for documentation tooling
Signed-off-by: Mary Anthony <mary@docker.com>

Removing token per Victor

Signed-off-by: Mary Anthony <mary@docker.com>

Adding in PR comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-22 10:43:36 -07:00
Alexandre Beslic
ebd7576e41 temporary fix on node/agent term usage, fix docker info example
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-22 10:24:07 -07:00
Alexandre Beslic
928beefe21 Add example of secured setup using docker-machine, marks the manual setup as *unsecure*
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-21 20:40:58 -07:00
James Turnbull
d52e971190 Fixed typo
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2015-04-14 13:50:51 -04:00
James Turnbull
658c807eb9 Did a quick pass on the docs to fix numerous formatting, spelling and grammar errors
Signed-off-by: James Turnbull <james@lovedthanlost.net>
2015-04-14 11:59:50 -04:00
Fred Lifton
71f4e13493 Updates for 1.6 release
Adds release notes and getting help section.

Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-04-09 15:51:38 -07:00
Victor Vieux
0f6a1846e2 Merge pull request #512 from abronan/doc_config_changes
Move note on top of Nodes config to avoid confusion
2015-03-30 16:33:34 -07:00
Alexandre Beslic
a900458756 Removed useless code blocks and fixed templates
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2015-03-30 15:16:06 -07:00
Alexandre Beslic
e421df418a Fixed indentation and template commands
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2015-03-30 15:06:18 -07:00
Alexandre Beslic
24745b7703 Change doc structure to better explain pre-requisites and Set-up process
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2015-03-30 14:16:33 -07:00
Tom Kapanka
56626698fa Fix 404s that manifest in GitHub but not in the Docs site. Links should work in both.
Spoke with Mary (Moxiegirl) about this issue and it occurs because
when Docs is built, it pulls files from various places. This causes
the GitHub view to have broken links (and images) which isn't ideal
since people may come to the docs via either approach.

Signed-off-by: Tom Kapanka <tom@kapanka.com>
2015-03-25 20:45:19 -07:00