From 6d4b0f53342f4b56ad0770bd0e1bce6fcd898a41 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 26 Feb 2015 09:46:55 +1000 Subject: [PATCH] update the mkdocs.yml to add new docs Signed-off-by: Sven Dowideit --- docs/Dockerfile | 7 +++++++ docs/mkdocs.yml | 3 +++ docs/sources/userguide/index.md | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/docs/Dockerfile b/docs/Dockerfile index b11347fb9d..ad50147d33 100644 --- a/docs/Dockerfile +++ b/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 diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 8d8f4c3465..76711640c0 100644 --- a/docs/mkdocs.yml +++ b/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**'] diff --git a/docs/sources/userguide/index.md b/docs/sources/userguide/index.md index 64bd3d16f3..d0dbdb84ee 100644 --- a/docs/sources/userguide/index.md +++ b/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/)