Browse code
update the mkdocs.yml to add new docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Sven Dowideit authored on 2015/02/26 08:46:55Showing 3 changed files
| ... | ... |
@@ -51,5 +51,12 @@ RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/cli.md |
| 51 | 51 |
ADD https://raw.githubusercontent.com/docker/fig/master/docs/yml.md /docs/sources/compose/yml.md |
| 52 | 52 |
RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/yml.md |
| 53 | 53 |
|
| 54 |
+ADD https://raw.githubusercontent.com/docker/fig/master/docs/django.md /docs/sources/compose/django.md |
|
| 55 |
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/django.md |
|
| 56 |
+ADD https://raw.githubusercontent.com/docker/fig/master/docs/rails.md /docs/sources/compose/rails.md |
|
| 57 |
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/rails.md |
|
| 58 |
+ADD https://raw.githubusercontent.com/docker/fig/master/docs/wordpress.md /docs/sources/compose/wordpress.md |
|
| 59 |
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/wordpress.md |
|
| 60 |
+ |
|
| 54 | 61 |
# Then build everything together, ready for mkdocs |
| 55 | 62 |
RUN /docs/build.sh |
| ... | ... |
@@ -88,6 +88,9 @@ pages: |
| 88 | 88 |
- ['examples/running_ssh_service.md', 'Examples', 'Dockerizing an SSH service'] |
| 89 | 89 |
- ['examples/couchdb_data_volumes.md', 'Examples', 'Dockerizing a CouchDB service'] |
| 90 | 90 |
- ['examples/apt-cacher-ng.md', 'Examples', 'Dockerizing an Apt-Cacher-ng service'] |
| 91 |
+- ['compose/django.md', 'Examples', 'Getting started with Compose and Django'] |
|
| 92 |
+- ['compose/rails.md', 'Examples', 'Getting started with Compose and Rails'] |
|
| 93 |
+- ['compose/wordpress.md', 'Examples', 'Getting started with Compose and Wordpress'] |
|
| 91 | 94 |
|
| 92 | 95 |
# Articles |
| 93 | 96 |
- ['articles/index.md', '**HIDDEN**'] |
| ... | ... |
@@ -80,6 +80,31 @@ Trusted Builds and private repositories. |
| 80 | 80 |
|
| 81 | 81 |
Go to [Working with Docker Hub](/userguide/dockerrepos). |
| 82 | 82 |
|
| 83 |
+## Docker Compose |
|
| 84 |
+ |
|
| 85 |
+Docker Compose allows you to define a application's components -- their containers, |
|
| 86 |
+configuration, links and volumes -- in a single file. Then a single command |
|
| 87 |
+will set everything up and start your application running. |
|
| 88 |
+ |
|
| 89 |
+Go to [Docker Compose user guide](/compose/). |
|
| 90 |
+ |
|
| 91 |
+## Docker Machine |
|
| 92 |
+ |
|
| 93 |
+Docker Machine helps you get Docker Engines up and running quickly. Machine |
|
| 94 |
+can set up hosts for Docker Engines on your computer, on cloud providers, |
|
| 95 |
+and/or in your data center, and then configure your Docker client to securely |
|
| 96 |
+talk to them. |
|
| 97 |
+ |
|
| 98 |
+Go to [Docker Machine user guide](/machine/). |
|
| 99 |
+ |
|
| 100 |
+## Docker Swarm |
|
| 101 |
+ |
|
| 102 |
+Docker Swarm pools several Docker Engines together and exposes them as a single |
|
| 103 |
+virtual Docker Engine. It serves the standard Docker API, so any tool that already |
|
| 104 |
+works with Docker can now transparently scale up to multiple hosts. |
|
| 105 |
+ |
|
| 106 |
+Go to [Docker Swarm user guide](/swarm/). |
|
| 107 |
+ |
|
| 83 | 108 |
## Getting help |
| 84 | 109 |
|
| 85 | 110 |
* [Docker homepage](http://www.docker.com/) |