Merge pull request #2936 from dnephin/update_docs_for_161

Update docs, fix broken link, use v2 compose file format

docs/compose-file.md

@@ -626,7 +626,7 @@ While it is possible to declare volumes on the fly as part of the service
 declaration, this section allows you to create named volumes that can be
 reused across multiple services (without relying on `volumes_from`), and are
 easily retrieved and inspected using the docker command line or API.
-See the [docker volume](http://docs.docker.com/reference/commandline/volume/)
+See the [docker volume](/engine/reference/commandline/volume_create.md)
 subcommand documentation for more information.
 
 ### driver

docs/django.md

@@ -72,17 +72,19 @@ and a `docker-compose.yml` file.
 
 9. Add the following configuration to the file.
 
-        db:
+        version: '2'
-          image: postgres
+        services:
-        web:
+          db:
-          build: .
+            image: postgres
-          command: python manage.py runserver 0.0.0.0:8000
+          web:
-          volumes:
+            build: .
-            - .:/code
+            command: python manage.py runserver 0.0.0.0:8000
-          ports:
+            volumes:
-            - "8000:8000"
+              - .:/code
-          links:
+            ports:
-            - db
+              - "8000:8000"
+            depends_on:
+              - db
 
     This file defines two services: The `db` service and the `web` service.
 

docs/gettingstarted.md

@@ -95,16 +95,19 @@ Define a set of services using `docker-compose.yml`:
 1. Create a file called docker-compose.yml in your project directory and add
    the following:
 
-        web:
+
-          build: .
+        version: '2'
-          ports:
+        services:
-           - "5000:5000"
+          web:
-          volumes:
+            build: .
-           - .:/code
+            ports:
-          links:
+             - "5000:5000"
-           - redis
+            volumes:
-        redis:
+             - .:/code
-          image: redis
+            depends_on:
+             - redis
+          redis:
+            image: redis
 
 This Compose file defines two services, `web` and `redis`. The web service:
 

docs/rails.md

@@ -49,17 +49,19 @@ one's Docker image (the database just runs on a pre-made PostgreSQL image, and
 the web app is built from the current directory), and the configuration needed
 to link them together and expose the web app's port.
 
-    db:
+    version: '2'
-      image: postgres
+    services:
-    web:
+      db:
-      build: .
+        image: postgres
-      command: bundle exec rails s -p 3000 -b '0.0.0.0'
+      web:
-      volumes:
+        build: .
-        - .:/myapp
+        command: bundle exec rails s -p 3000 -b '0.0.0.0'
-      ports:
+        volumes:
-        - "3000:3000"
+          - .:/myapp
-      links:
+        ports:
-        - db
+          - "3000:3000"
+        depends_on:
+          - db
 
 ### Build the project
 

docs/wordpress.md

@@ -41,19 +41,21 @@ and WordPress.
 Next you'll create a `docker-compose.yml` file that will start your web service
 and a separate MySQL instance:
 
-    web:
+    version: '2'
-      build: .
+    services:
-      command: php -S 0.0.0.0:8000 -t /code
+      web:
-      ports:
+        build: .
-        - "8000:8000"
+        command: php -S 0.0.0.0:8000 -t /code
-      links:
+        ports:
-        - db
+          - "8000:8000"
-      volumes:
+        depends_on:
-        - .:/code
+          - db
-    db:
+        volumes:
-      image: orchardup/mysql
+          - .:/code
-      environment:
+      db:
-        MYSQL_DATABASE: wordpress
+        image: orchardup/mysql
+        environment:
+          MYSQL_DATABASE: wordpress
 
 A supporting file is needed to get this working. `wp-config.php` is
 the standard WordPress config file with a single change to point the database