Browse Source

update the mkdocs.yml to add new docs

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Sven Dowideit 10 years ago
parent
commit
6d4b0f5334
3 changed files with 35 additions and 0 deletions
  1. 7 0
      docs/Dockerfile
  2. 3 0
      docs/mkdocs.yml
  3. 25 0
      docs/sources/userguide/index.md

+ 7 - 0
docs/Dockerfile

@@ -51,5 +51,12 @@ RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/cli.md
 ADD https://raw.githubusercontent.com/docker/fig/master/docs/yml.md /docs/sources/compose/yml.md
 RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/yml.md
 
+ADD https://raw.githubusercontent.com/docker/fig/master/docs/django.md /docs/sources/compose/django.md
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/django.md
+ADD https://raw.githubusercontent.com/docker/fig/master/docs/rails.md /docs/sources/compose/rails.md
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/rails.md
+ADD https://raw.githubusercontent.com/docker/fig/master/docs/wordpress.md /docs/sources/compose/wordpress.md
+RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/wordpress.md
+
 # Then build everything together, ready for mkdocs
 RUN /docs/build.sh

+ 3 - 0
docs/mkdocs.yml

@@ -88,6 +88,9 @@ pages:
 - ['examples/running_ssh_service.md', 'Examples', 'Dockerizing an SSH service']
 - ['examples/couchdb_data_volumes.md', 'Examples', 'Dockerizing a CouchDB service']
 - ['examples/apt-cacher-ng.md', 'Examples', 'Dockerizing an Apt-Cacher-ng service']
+- ['compose/django.md', 'Examples', 'Getting started with Compose and Django']
+- ['compose/rails.md', 'Examples', 'Getting started with Compose and Rails']
+- ['compose/wordpress.md', 'Examples', 'Getting started with Compose and Wordpress']
 
 # Articles
 - ['articles/index.md', '**HIDDEN**']

+ 25 - 0
docs/sources/userguide/index.md

@@ -80,6 +80,31 @@ Trusted Builds and private repositories.
 
 Go to [Working with Docker Hub](/userguide/dockerrepos).
 
+## Docker Compose
+
+Docker Compose allows you to define a application's components -- their containers,
+configuration, links and volumes -- in a single file. Then a single command
+will set everything up and start your application running.
+
+Go to [Docker Compose user guide](/compose/).
+
+## Docker Machine
+
+Docker Machine helps you get Docker Engines up and running quickly. Machine
+can set up hosts for Docker Engines on your computer, on cloud providers,
+and/or in your data center, and then configure your Docker client to securely
+talk to them.
+
+Go to [Docker Machine user guide](/machine/).
+
+## Docker Swarm
+
+Docker Swarm pools several Docker Engines together and exposes them as a single
+virtual Docker Engine. It serves the standard Docker API, so any tool that already
+works with Docker can now transparently scale up to multiple hosts.
+
+Go to [Docker Swarm user guide](/swarm/).
+
 ## Getting help
 
 * [Docker homepage](http://www.docker.com/)